summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-09-21 10:47:59 -0400
committerLoren Shih <seraph@lindenlab.com>2010-09-21 10:47:59 -0400
commit9b16a05c07372d2d86be0be1b914086984ea5285 (patch)
treeb25cdc8ada6c74abe97d1ebb9f755ae45dcde0f5 /indra/newview/skins
parent80a33895dc715c86dbeef09f19819d981355d9bd (diff)
SH-178 FIXED As a non-god, I don't want to see admin options
Admin options are now enabled by a debug setting.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml20
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 19707c1bc9..72677de357 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3038,15 +3038,6 @@
<menu_item_separator/>
- <menu_item_check
- label="Show Admin Menu"
- name="View Admin Options">
- <menu_item_check.on_check
- function="Advanced.CheckViewAdminOptions"
- parameter="ViewAdminOptions" />
- <menu_item_check.on_click
- function="Advanced.ToggleViewAdminOptions" />
- </menu_item_check>
<menu_item_call
label="Request Admin Status"
name="Request Admin Options"
@@ -3061,6 +3052,17 @@
<menu_item_call.on_click
function="Advanced.LeaveAdminStatus" />
</menu_item_call>
+ <menu_item_check
+ label="Show Admin Menu"
+ name="View Admin Options">
+ <menu_item_check.on_enable
+ function="Advanced.EnableViewAdminOptions" />
+ <menu_item_check.on_check
+ function="Advanced.CheckViewAdminOptions"
+ parameter="ViewAdminOptions" />
+ <menu_item_check.on_click
+ function="Advanced.ToggleViewAdminOptions" />
+ </menu_item_check>
</menu>
<menu
create_jump_keys="true"