Merge branch 'ryzom/op_refactoring' into yubo

code/ryzom/client/src/client_sheets/sbrick_sheet.cpp

@@ -549,6 +549,6 @@ bool							CSBrickSheet::mustDisplayLevel() const
 	// NB: Yoyo Hack. special interface with indexInFamily==63 means "want to display the level"
 	return !(	isMandatory() ||
 				isRoot() ||
-				(BrickFamily>= BRICK_FAMILIES::BeginInterface && BrickFamily<= BRICK_FAMILIES::EndInterface && IndexInFamily!=63) ||
+				//(BrickFamily>= BRICK_FAMILIES::BeginInterface && BrickFamily<= BRICK_FAMILIES::EndInterface && IndexInFamily!=63) ||
 				Level==0 );
 }

code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -2456,7 +2456,6 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 
 
 						if ((i - 1) < _BoostIcons.size()) {
-							nlinfo("Boost icon  = %s", rVR.getTextureNameFromId(_BoostIcons[i-1].TextureId).c_str());
 							rVR.drawRotFlipBitmap(_RenderLayer + 2, xIcon+wIcon-_BoostIcons[i-1].IconW, yIcon, _BoostIcons[i-1].IconW, _BoostIcons[i-1].IconH, 0, false, _BoostIcons[i-1].TextureId, fastMulRGB(curSheetColor, _BoostIcons[i-1].Color));
 						}
 					}

code/ryzom/client/src/outpost_manager.cpp

@@ -68,7 +68,7 @@ void	COutpostManager::startPvpJoinProposal(OUTPOSTENUMS::TPVPType type, bool out
 
 	ctrl = dynamic_cast<CCtrlBase *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:join_pvp_outpost_proposal:content:neutral"));
 	if (ctrl)
-		ctrl->setActive(type != OUTPOSTENUMS::GVE || !outpostInFire);
+		ctrl->setActive(type == OUTPOSTENUMS::GVE || !outpostInFire);
 
 	// GvE: only attacker guild can have the option
 	ctrl = dynamic_cast<CCtrlBase *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:join_pvp_outpost_proposal:content:attack"));

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

@@ -32,9 +32,9 @@ namespace OUTPOSTENUMS
 		NL_STRING_CONVERSION_TABLE_ENTRY(PVP)
 		NL_STRING_CONVERSION_TABLE_ENTRY(RVR)
 		NL_STRING_CONVERSION_TABLE_ENTRY(Full)
-		NL_STRING_CONVERSION_TABLE_ENTRY(UnknownPVPType)
 		NL_STRING_CONVERSION_TABLE_ENTRY(GVE)
 		NL_STRING_CONVERSION_TABLE_ENTRY(GVG)
+		NL_STRING_CONVERSION_TABLE_ENTRY(UnknownPVPType)
 	NL_END_STRING_CONVERSION_TABLE(TPVPType, StaticCOutpostTPVPTypeConversion, UnknownPVPType)
 
 	NL_BEGIN_STRING_CONVERSION_TABLE (TPVPSide)

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

@@ -37,7 +37,7 @@ struct SPropVisualA
 		uint64	JacketColor		: 3;  // max: 8		current: 8
 		uint64	TrouserModel	: 8;  // max: 256	current: 104
 		uint64	TrouserColor	: 3;  // max: 8		current: 8
-		uint64	WeaponRightHand	: 10; // max: 1024	current: 457
+		uint64	WeaponRightHand	: 10; // max: 1024	current: 625
 		uint64	WeaponLeftHand	: 8;  // max: 256	current: 63
 		uint64	ArmModel		: 8;  // max: 256	current: 94
 		uint64	ArmColor		: 3;  // max: 8		current: 8