From b94ddeaa46c1f754c6b0b900fd3094aabe66e084 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 21 Jan 2011 13:29:17 -0500
Subject: [PATCH] SH-823 Admin menu does not appear when in god mode
Fixed this issue. Also, viewer-development has a duplicated "Region Debug Console" entry. I assume this duplication is a mistake / bad merge so I took out the duplicate.
---
.../skins/default/xui/en/menu_viewer.xml | 34 +------------------
1 file changed, 1 insertion(+), 33 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6211561a5df..cb2cbbe033c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2571,18 +2571,6 @@
function="ToggleControl"
parameter="PingInterpolate" />
</menu_item_check>
- <menu_item_check
- label="Region Debug Console"
- name="Region Debug Console"
- shortcut="control|shift|`"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="region_debug_console" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="region_debug_console" />
- </menu_item_check>
<menu_item_separator/>
@@ -2781,26 +2769,6 @@
function="Floater.Toggle"
parameter="region_debug_console" />
</menu_item_check>
- <menu_item_check
- <menu_item_separator />
-
- <menu_item_check
- label="Region Debug Console"
- name="Region Debug Console"
- shortcut="control|shift|`"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="region_debug_console" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="region_debug_console" />
- </menu_item_check>
-
- <menu_item_separator />
-
- <menu_item_check
-
<menu_item_separator />
<menu_item_check
@@ -3198,7 +3166,7 @@
<menu_item_call.on_click
function="Advanced.LeaveAdminStatus" />
</menu_item_call>
- <menu_item_check
+ <menu_item_check
label="Show Admin Menu"
name="View Admin Options">
<menu_item_check.on_enable
--
GitLab