Merge

--HG-- branch : compatibility-develop
9 years ago · 0540c386a6
parent 325242c2e4 2be87f3c3e
commit 0540c386a6
2 changed files with 2 additions and 4 deletions
--- a/code/ryzom/common/data_common/database.xml
+++ b/code/ryzom/common/data_common/database.xml
@ -1512,8 +1512,6 @@
            type="I5" />
      <leaf name="DESPAWN"
            type="I7" />
-      <leaf name="NAME"
-            type="I32" />
    </branch>
  </branch>
  <branch name="DEBUG_INFO"
--- a/code/ryzom/common/data_common/msg.xml
+++ b/code/ryzom/common/data_common/msg.xml
@ -355,11 +355,11 @@
    <leaf name="EQUIP"
          sendto="EGS"
          format="u16 u16 u16"
-          description="the client equip character (equipped inventory, equipped inventory slot, bag slot)" />
+          description="the client equip character (equiped inventory, equiped inventory slot, bag slot)" />
    <leaf name="UNEQUIP"
          sendto="EGS"
          format="u16 u16"
-          description="the client unequip character (equipped inventory, equipped inventory slot)" />
+          description="the client unequip character (equiped inventory, equiped inventory slot)" />
    <leaf name="TEMP_TO_BAG"
          sendto="EGS"
          format="u16"