From bae06b4b62587bd567495e3940a323e4c635a63e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 7 May 2010 16:47:39 -0700
Subject: DEV-49780 Moved Display Names debug toggle to Advanced Prefs

---
 indra/newview/llfloaterpreference.cpp                            | 9 +++++++++
 indra/newview/llviewermenu.cpp                                   | 4 ----
 indra/newview/skins/default/xui/en/menu_viewer.xml               | 9 ---------
 .../newview/skins/default/xui/en/panel_preferences_advanced.xml  | 8 ++++++++
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 57eafb91a4..813f9a06b7 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -81,6 +81,7 @@
 #include "llvosky.h"
 
 // linden library includes
+#include "llavatarnamecache.h"
 #include "llerror.h"
 #include "llfontgl.h"
 #include "llrect.h"
@@ -461,6 +462,10 @@ void LLFloaterPreference::apply()
 		}
 	}
 
+	LLUICtrl* display_names_check = getChild<LLUICtrl>("display_names_check");
+	bool use_display_names = display_names_check->getValue().asBoolean();
+	LLAvatarNameCache::setUseDisplayNames(use_display_names);
+
 	applyResolution();
 }
 
@@ -541,6 +546,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	LLPanelLogin::setAlwaysRefresh(true);
 	refresh();
 	
+	bool use_display_names = LLAvatarNameCache::useDisplayNames();
+	LLUICtrl* display_names_check = getChild<LLUICtrl>("display_names_check");
+	display_names_check->setValue( LLSD(use_display_names) );
+
 	// Make sure the current state of prefs are saved away when
 	// when the floater is opened.  That will make cancel do its
 	// job
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9fe16b5253..0934e5df58 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7765,10 +7765,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
 	view_listener_t::addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
 	
-	// IDEVO
-	commit.add("IDEVO.ToggleDisplayNames", boost::bind(&toggle_display_names));
-	enable.add("IDEVO.CheckDisplayNames", boost::bind(&LLAvatarNameCache::useDisplayNames));
-	
 	// Advanced > HUD Info
 	view_listener_t::addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
 	view_listener_t::addMenu(new LLAdvancedCheckHUDInfo(), "Advanced.CheckHUDInfo");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0f319ba6dc..a08bc16066 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -9,15 +9,6 @@
      layout="topleft"
      name="Me"
      tear_off="true">
-        <menu_item_check
-         label="Display Name Demo"
-         name="display_name_prototype">
-            <menu_item_check.on_check
-             function="IDEVO.CheckDisplayNames" />
-            <menu_item_check.on_click
-             function="IDEVO.ToggleDisplayNames" />
-		</menu_item_check>
-		<menu_item_separator />
         <menu_item_call
          label="Preferences"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index e604e401f6..8d49d3dfcd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -271,4 +271,12 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
+  <check_box
+  follows="top|left"
+  height="15"
+  label="Use Display Names (PLACEHOLDER)"
+  left="30"
+  name="display_names_check"
+  width="237"
+  tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 </panel>
-- 
cgit v1.2.3