From d571b911e1674ce82dd92c7886cac2a0bdbc5fbf Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 22 May 2011 11:55:30 +0200
Subject: [PATCH] - changed : removed the experimental @displayname=n command  
   -> display name is changed through web profiles starting with SL-2.5

--HG--
branch : RLVa
---
 indra/newview/llpanelme.cpp  | 17 ++---------------
 indra/newview/rlvdefines.h   |  2 --
 indra/newview/rlvhandler.cpp |  3 ---
 indra/newview/rlvhelper.cpp  |  8 ++++----
 indra/newview/rlvui.cpp      | 20 --------------------
 indra/newview/rlvui.h        |  1 -
 6 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 664a68fbd4..d3c9c3e131 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -40,10 +40,6 @@
 #include "llsidetray.h"
 #include "llviewercontrol.h"
 #include "llviewerdisplayname.h"
-// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a)
-#include "rlvhandler.h"
-#include "rlvui.h"
-// [/RLVa:KB]
 
 // Linden libraries
 #include "llavatarnamecache.h"		// IDEVO
@@ -184,9 +180,6 @@ LLPanelMyProfileEdit::LLPanelMyProfileEdit()
 	setAvatarId(gAgent.getID());
 
 	LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&LLPanelMyProfileEdit::onAvatarNameChanged, this));
-// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Added: RLVa-1.2.1a
-	RlvUIEnabler::instance().addBehaviourToggleCallback(RLV_BHVR_DISPLAYNAME, boost::bind(&LLPanelMyProfileEdit::onAvatarNameChanged, this));
-// [/RLVa:KB]
 }
 
 void LLPanelMyProfileEdit::onOpen(const LLSD& key)
@@ -220,10 +213,7 @@ void LLPanelMyProfileEdit::onOpen(const LLSD& key)
 		getChild<LLUICtrl>("user_slid")->setVisible( true );
 		getChild<LLUICtrl>("display_name_label")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setVisible( true );
-//		getChild<LLUICtrl>("set_name")->setEnabled( true );
-// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Added: RLVa-1.2.1a
-		getChild<LLUICtrl>("set_name")->setEnabled( !gRlvHandler.hasBehaviour(RLV_BHVR_DISPLAYNAME) );
-// [/RLVa:KB]
+		getChild<LLUICtrl>("set_name")->setEnabled( true );
 		getChild<LLUICtrl>("solo_user_name")->setVisible( false );
 		getChild<LLUICtrl>("solo_username_label")->setVisible( false );
 	}
@@ -295,10 +285,7 @@ void LLPanelMyProfileEdit::onNameCache(const LLUUID& agent_id, const LLAvatarNam
 		getChild<LLUICtrl>("user_slid")->setVisible( true );
 		getChild<LLUICtrl>("display_name_label")->setVisible( true );
 		getChild<LLUICtrl>("set_name")->setVisible( true );
-//		getChild<LLUICtrl>("set_name")->setEnabled( true );
-// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Added: RLVa-1.2.1a
-		getChild<LLUICtrl>("set_name")->setEnabled( !gRlvHandler.hasBehaviour(RLV_BHVR_DISPLAYNAME) );
-// [/RLVa:KB]
+		getChild<LLUICtrl>("set_name")->setEnabled( true );
 
 		getChild<LLUICtrl>("solo_user_name")->setVisible( false );
 		getChild<LLUICtrl>("solo_username_label")->setVisible( false );
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 2a0f962389..8559ff8ba5 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -49,7 +49,6 @@
 	#define RLV_EXTENSION_CMD_GETXXXNAMES	// @get[add|rem]attachnames:<option>=<channel> and @get[add|rem]outfitnames=<channel>
 	#define RLV_EXTENSION_CMD_INTERACT		// @interact=n
 	#define RLV_EXTENSION_CMD_TOUCHXXX		// @touch:uuid=n|y, @touchworld[:<uuid>]=n|y, @touchattach[:<uuid>]=n|y, @touchud[:<uuid>]=n|y
-	#define RLV_EXTENSION_CMD_DISPLAYNAME	// @displayname=n
 #endif // RLV_EXPERIMENTAL_CMDS
 
 // ============================================================================
@@ -166,7 +165,6 @@ enum ERlvBehaviour {
 	RLV_BHVR_ACCEPTPERMISSION,		// "acceptpermission"
 	RLV_BHVR_ACCEPTTP,				// "accepttp"
 	RLV_BHVR_ALLOWIDLE,				// "allowidle"
-	RLV_BHVR_DISPLAYNAME,			// "displayname"
 	RLV_BHVR_EDIT,					// "edit"
 	RLV_BHVR_EDITOBJ,				// "editobj"
 	RLV_BHVR_REZ,					// "rez"
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 29af48135e..2d927d00e9 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1278,9 +1278,6 @@ ERlvCmdRet RlvHandler::processAddRemCommand(const RlvCommand& rlvCmd)
 #ifdef RLV_EXTENSION_CMD_ALLOWIDLE
 		case RLV_BHVR_ALLOWIDLE:			// @allowidle=n|y					- Checked: 2010-05-03 (RLVa-1.2.0g) | Modified: RLVa-1.1.0h
 #endif // RLV_EXTENSION_CMD_ALLOWIDLE
-#ifdef RLV_EXTENSION_CMD_DISPLAYNAME
-		case RLV_BHVR_DISPLAYNAME:			// @displayname=n|y					- Checked: 2010-11-02 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
-#endif // RLV_EXTENSION_CMD_DISPLAYNAME
 		case RLV_BHVR_REZ:					// @rez=n|y							- Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
 		case RLV_BHVR_FARTOUCH:				// @fartouch=n|y					- Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
 #ifdef RLV_EXTENSION_CMD_INTERACT
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 8382b20618..3b8cb8517e 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -159,10 +159,10 @@ void RlvCommand::initLookupTable()
 				"redirchat", "rediremote", "chatwhisper", "chatnormal", "chatshout", "sendchannel", "sendim", "sendimto", 
 				"recvim", "recvimfrom", "startim", "startimto", "permissive", "notify", "showinv", "showminimap", "showworldmap", "showloc", 
 				"shownames", "showhovertext", "showhovertexthud", "showhovertextworld", "showhovertextall", "tplm", "tploc", "tplure", 
-				"viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "allowidle", "displayname", "edit", "editobj", 
-				"rez", "fartouch", "interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", 
-				"touchall", "touchme", "fly", "setgroup", "unsit", "sit", "sittp", "standtp", "setdebug", "setenv", "alwaysrun", "temprun", 
-				"detachme", "attachover", "attachthis", "attachthisover", "attachthisexcept", "detachthis", "detachthisexcept", "attachall", 
+				"viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "allowidle", "edit", "editobj", "rez", "fartouch", 
+				"interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", "touchall", 
+				"touchme", "fly", "setgroup", "unsit", "sit", "sittp", "standtp", "setdebug", "setenv", "alwaysrun", "temprun", "detachme", 
+				"attachover", "attachthis", "attachthisover", "attachthisexcept", "detachthis", "detachthisexcept", "attachall", 
 				"attachallover", "detachall", "attachallthis", "attachallthisexcept", "attachallthisover", "detachallthis", 
 				"detachallthisexcept", "adjustheight", "tpto", "version", "versionnew", "versionnum", "getattach", "getattachnames", 
 				"getaddattachnames", "getremattachnames", "getoutfit", "getoutfitnames", "getaddoutfitnames", "getremoutfitnames", 
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 37b7d3c8be..0123d356d5 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -68,7 +68,6 @@ RlvUIEnabler::RlvUIEnabler()
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_VIEWTEXTURE, boost::bind(&RlvUIEnabler::onToggleViewXXX, this)));
 
 	// onToggleXXX
-	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_DISPLAYNAME, boost::bind(&RlvUIEnabler::onToggleDisplayName, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_EDIT, boost::bind(&RlvUIEnabler::onToggleEdit, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_FLY, boost::bind(&RlvUIEnabler::onToggleFly, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_REZ, boost::bind(&RlvUIEnabler::onToggleRez, this)));
@@ -117,25 +116,6 @@ void RlvUIEnabler::onRefreshHoverText()
 	LLHUDText::refreshAllObjectText();
 }
 
-// Checked: 2010-11-02 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
-void RlvUIEnabler::onToggleDisplayName()
-{
-	static const char cstrFloaterChangeDisplayName[] = "display_name";
-
-	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_DISPLAYNAME);
-	if (!fEnable)
-	{
-		// Hide the "Change Display Name" floater if it's currently visible
-		if (LLFloaterReg::floaterInstanceVisible(cstrFloaterChangeDisplayName))
-			LLFloaterReg::hideInstance(cstrFloaterChangeDisplayName);
-	}
-
-	if (!fEnable)
-		addGenericFloaterFilter(cstrFloaterChangeDisplayName);
-	else
-		removeGenericFloaterFilter(cstrFloaterChangeDisplayName);
-}
-
 // Checked: 2010-03-17 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
 void RlvUIEnabler::onToggleEdit()
 {
diff --git a/indra/newview/rlvui.h b/indra/newview/rlvui.h
index dd583e1769..2e88de23c5 100644
--- a/indra/newview/rlvui.h
+++ b/indra/newview/rlvui.h
@@ -46,7 +46,6 @@ public:
 	 */
 protected:
 	void onRefreshHoverText();											// showloc, shownames, showhovertext(all|world|hud)
-	void onToggleDisplayName();											// displayname
 	void onToggleEdit();												// edit
 	void onToggleFly();													// fly
 	void onToggleRez();													// rez