diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-18 15:30:40 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-18 15:30:40 -0500 |
| commit | 3ac552c5048c13bc2912d25877728a057b195300 (patch) | |
| tree | 009225c01efdd39ac488b90d2df67ebbc47a8df4 /indra/newview/llviewermenu.cpp | |
| parent | 5dea0791f7087f2ce2bbe2bdce49d62f1a6f1f92 (diff) | |
| parent | 1875d5e37ba1591ba9b75014a7618f38427f0d2f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 68a9aaef75..6a6aa1061d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5189,7 +5189,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 || gAgent.getAdminOverride()); + const bool show_server_menu = (gAgent.getGodLevel() > GOD_NOT || (debug && gAgent.getAdminOverride())); gMenuBarView->setItemVisible("Admin", show_server_menu); gMenuBarView->setItemEnabled("Admin", show_server_menu); } |