From cd401f259a46e5e0e030a0672e574bfcd1a1f314 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 12 Mar 2010 03:06:56 -0600
Subject: Restored some missing Advanced menu items from SL 1.23. (#175)

* Advanced > UI  > Use default system color picker
* Advanced > UI  > Show search panel in overlay bar
* Advanced > UI  > Show Matrices
* Advanced > XUI > Font Test...
---
 linden/indra/newview/llviewermenu.cpp              | 21 ++++++++++++----
 .../skins/default/xui/en-us/menu_viewer.xml        | 28 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c5964d5..0aec752 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1046,14 +1046,11 @@ extern BOOL gDebugSelectMgr;
 
 void init_debug_ui_menu(LLMenuGL* menu)
 {
-	// For Imprudence 1.3 - need to XUIfy (or move back to preferences?)
 	menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
-	// For Imprudence 1.3 - need to XUIfy (or remove to advance our marxist schemes!)
 	menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
 	menu->appendSeparator();
 
 	menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
-	// For Imprudence 1.3 - need to XUIfy
 	// commented out until work is complete: DEV-32268
 	// menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
 	menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
@@ -1079,7 +1076,6 @@ void init_debug_ui_menu(LLMenuGL* menu)
 	menu->appendSeparator();
 	menu->append(new LLMenuItemCheckGL("Show Time", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowTime"));
 	menu->append(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo"));
-	// For Imprudence 1.3 - need to XUIfy
 	menu->append(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices"));
 	menu->append(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor"));
 	
@@ -9586,6 +9582,22 @@ class LLAdvancedShowFloaterTest : public view_listener_t
 
 
 
+////////////////////
+// SHOW FONT TEST //
+////////////////////
+
+
+class LLAdvancedShowFontTest : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLFloaterFontTest::show(NULL);
+		return true;
+	}
+};
+
+
+
 /////////////////////////
 // EXPORT MENUS TO XML //
 /////////////////////////
@@ -10964,6 +10976,7 @@ void initialize_menus()
 
 	// Advanced > XUI
 	addMenu(new LLAdvancedShowFloaterTest(), "Advanced.ShowFloaterTest");
+	addMenu(new LLAdvancedShowFontTest(), "Advanced.ShowFontTest");
 	addMenu(new LLAdvancedExportMenusToXML(), "Advanced.ExportMenusToXML");
 	addMenu(new LLAdvancedEditUI(), "Advanced.EditUI");
 	addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index f1c7a47..9c02f07 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1510,6 +1510,23 @@
     <menu name="UI" drop_shadow="true"
           opaque="true" tear_off="true">
 
+      
+      <menu_item_check name="Use default system color picker"
+                       label="Use default system color picker">
+        <on_click function="ToggleControl"
+                  userdata="UseDefaultColorPicker" />
+        <on_check control="UseDefaultColorPicker" />
+      </menu_item_check>
+
+      <menu_item_check name="Show search panel in overlay bar"
+                       label="Show search panel in overlay bar">
+        <on_click function="ToggleControl"
+                  userdata="ShowSearchBar" />
+        <on_check control="ShowSearchBar" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
       <menu_item_call name="Web Browser Test" label="Web Browser Test">
         <on_click function="Advanced.WebBrowserTest" userdata="" />
       </menu_item_call>
@@ -1623,6 +1640,12 @@
                   userdata="DebugShowRenderInfo" />
         <on_check control="DebugShowRenderInfo" />
       </menu_item_check>
+      <menu_item_check name="Show Matrices"
+                       label="Show Matrices">
+        <on_click function="ToggleControl"
+                  userdata="DebugShowRenderMatrices" />
+        <on_check control="DebugShowRenderMatrices" />
+      </menu_item_check>
       <menu_item_check name="Show Color Under Cursor"
                        label="Show Color Under Cursor">
         <on_click function="ToggleControl"
@@ -1642,6 +1665,11 @@
         <on_click function="Advanced.ShowFloaterTest"
                   userdata="" />
       </menu_item_call>
+      <menu_item_call name="Font Test..."
+                      label="Font Test...">
+        <on_click function="Advanced.ShowFontTest"
+                  userdata="" />
+      </menu_item_call>
       <menu_item_call name="Export Menus to XML..."
                       label="Export Menus to XML...">
         <on_click function="Advanced.ExportMenusToXML"
-- 
cgit v1.1