livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-2031 Admin Menu Missing Without Advanced Menu Enabled

master
Steve Bennetts 2009-11-06 16:14:42 -08:00
parent 66cf090114
commit 0a5cbfd195
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermenu.cpp
View File

@ -5192,7 +5192,7 @@ void show_debug_menus()
gMenuBarView->setItemEnabled("Develop", qamode);
// Server ('Admin') menu hidden when not in godmode.
const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT);
const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT || gAgent.getAdminOverride());
gMenuBarView->setItemVisible("Admin", show_server_menu);
gMenuBarView->setItemEnabled("Admin", show_server_menu);
}

18
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -98,6 +98,24 @@
function="World.SetBusy"/>
</menu_item_call>
</menu>
<menu_item_call
label="Request Admin Status"
layout="topleft"
name="Request Admin Options"
shortcut="control|alt|G"
visible="false">
<menu_item_call.on_click
function="Advanced.RequestAdminStatus" />
</menu_item_call>
<menu_item_call
label="Leave Admin Status"
layout="topleft"
name="Leave Admin Options"
shortcut="control|alt|shift|G"
visible="false">
<menu_item_call.on_click
function="Advanced.LeaveAdminStatus" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call