Merge branch 'ryzom/op_refactoring' into yubo

code/ryzom/client/src/connection.cpp

@@ -193,6 +193,7 @@ bool hasPrivilegeG() { return (UserPrivileges.find(":G:") != std::string::npos);
 bool hasPrivilegeEM() { return (UserPrivileges.find(":EM:") != std::string::npos); }
 bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != std::string::npos); }
 bool hasPrivilegeOBSERVER() { return (UserPrivileges.find(":OBSERVER:") != std::string::npos); }
+bool hasPrivilegeTESTER() { return (UserPrivileges.find(":TESTER:") != std::string::npos); }
 
 
 // Restore the video mode (fullscreen for example) after the connection (done in a window)

code/ryzom/client/src/connection.h

@@ -52,6 +52,7 @@ bool hasPrivilegeEM();
 bool hasPrivilegeEG();
 bool hasPrivilegeVG();
 bool hasPrivilegeOBSERVER();
+bool hasPrivilegeTESTER();
 
 
 // connection with the server. (login, shard list, etc.).

code/ryzom/client/src/game_context_menu.cpp

@@ -267,7 +267,7 @@ void		CGameContextMenu::update()
 
 	setupContextMenuCantTalk(); // can't talk by default
 
-	bool showGMOptions = (hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeVG() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeEG() || hasPrivilegeOBSERVER());
+	bool showGMOptions = (hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeVG() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeEG() || hasPrivilegeOBSERVER() || hasPrivilegeTESTER());
 
 	if (_TextInvisible)
 		_TextInvisible->setActive(showGMOptions);

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

@@ -2654,7 +2654,7 @@ void CGroupMap::createContinentLandMarks()
 
 static void hideTeleportButtonsInPopupMenuIfNotEnoughPriv()
 {
-	bool showTeleport = (hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeVG() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeEG() || hasPrivilegeOBSERVER());
+	bool showTeleport = (hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeVG() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeEG() || hasPrivilegeOBSERVER()|| hasPrivilegeTESTER());
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 
 	CInterfaceElement *ie = CWidgetManager::getInstance()->getElementFromId("ui:interface:map_menu:teleport");

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

@@ -33,6 +33,8 @@ namespace OUTPOSTENUMS
 		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_END_STRING_CONVERSION_TABLE(TPVPType, StaticCOutpostTPVPTypeConversion, UnknownPVPType)
 
 	NL_BEGIN_STRING_CONVERSION_TABLE (TPVPSide)

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

@@ -50,7 +50,9 @@ namespace OUTPOSTENUMS
 		PVE,	// can only be attacked if the outpost is held by a tribe and if the attacking guild comes from the same continent as the outpost
 		PVP,	// can only be attacked if the attacking guild comes from the same continent as the outpost
 		RVR,	// can only be attacked if the attacking guild comes from another continent as the outpost
-		Full	// same as RVR but cant be set by the high council
+		Full,	// same as RVR but cant be set by the high council
+		GVE,	// Only one guild vs tribes
+		GVG,	// Only one guild vs another guild
 	};
 
 	enum TPVPSide