Changed: #1135 Merge changes from Ryzom patch 1.10

code/ryzom/common/src/game_share/action_sint64.cpp

@@ -73,7 +73,7 @@ void CActionSint64::registerNumericPropertiesRyzom()
 	CActionSint64::registerNumericProperty( PROPERTY_GUILD_NAME_ID, 32 );
 	CActionSint64::registerNumericProperty( PROPERTY_EVENT_FACTION_ID, 32 );
 	CActionSint64::registerNumericProperty( PROPERTY_PVP_MODE, PVP_MODE::NbBits );
-	CActionSint64::registerNumericProperty( PROPERTY_PVP_CLAN, PVP_CLAN::NbBits );
+	CActionSint64::registerNumericProperty( PROPERTY_PVP_CLAN, 32 );
 	CActionSint64::registerNumericProperty( PROPERTY_OWNER_PEOPLE, 3 ); // 4 races and unknow
 	CActionSint64::registerNumericProperty( PROPERTY_OUTPOST_INFOS, 16 ); // 15+1
 }

code/ryzom/common/src/game_share/dyn_chat.h

@@ -33,6 +33,7 @@ typedef NLMISC::CEntityId	TChanID;
 
 // tag for invalid channel
 const TChanID DYN_CHAT_INVALID_CHAN = NLMISC::CEntityId::Unknown;
+const std::string DYN_CHAT_INVALID_NAME;
 
 
 /// Message payload for player input forward to channel service owner

code/ryzom/common/src/game_share/item_family.cpp

@@ -107,6 +107,7 @@ namespace ITEMFAMILY
 			fam == SHIELD ||
 			fam == JEWELRY ||
 			fam == CRYSTALLIZED_SPELL ||
+			fam == CONSUMABLE ||
 			fam == ITEM_SAP_RECHARGE;
 	}
 

code/ryzom/common/src/game_share/item_type.cpp

@@ -97,6 +97,7 @@ namespace ITEM_TYPE
 		{ "HAIRCOLOR_FEMALE", HAIRCOLOR_FEMALE },
 		{ "TATOO_FEMALE", TATOO_FEMALE },
 		{ "SERVICE_STABLE", SERVICE_STABLE },
+		{ "JOB_ELEMENT", JOB_ELEMENT },
 		{ "GENERIC", GENERIC },
 	};
 

code/ryzom/common/src/game_share/item_type.h

@@ -92,6 +92,7 @@ namespace ITEM_TYPE
 		HAIRCOLOR_FEMALE,
 		TATOO_FEMALE,
 		SERVICE_STABLE,
+		JOB_ELEMENT,
 		GENERIC,
 
 		UNDEFINED,

code/ryzom/common/src/game_share/ryzom_mirror_properties.h

@@ -139,7 +139,7 @@ void	initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
 
 #define TYPE_EVENT_FACTION_ID uint32
 #define TYPE_PVP_MODE uint8
-#define TYPE_PVP_CLAN uint8
+#define TYPE_PVP_CLAN uint32
 
 #define TYPE_FUEL bool