diff options
author | McCabe Maxsted | 2009-06-11 01:29:16 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-11 01:29:16 -0700 |
commit | bc873f21dd6c414eba6e60e48d8985b39dd0980f (patch) | |
tree | 6aedf8a06f6f6af47254d46594e10bef2a29fecb /linden/indra/newview/llviewermenu.cpp | |
parent | Added pulldown label and fixed combobox not hiding (diff) | |
download | meta-impy-bc873f21dd6c414eba6e60e48d8985b39dd0980f.zip meta-impy-bc873f21dd6c414eba6e60e48d8985b39dd0980f.tar.gz meta-impy-bc873f21dd6c414eba6e60e48d8985b39dd0980f.tar.bz2 meta-impy-bc873f21dd6c414eba6e60e48d8985b39dd0980f.tar.xz |
Applied Armin's patch to create an Advanced Menu menu item (placed it in View and changed it to a check)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index b255883..4dedf49 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -4542,6 +4542,25 @@ void print_agent_nvpairs(void*) | |||
4542 | llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl; | 4542 | llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl; |
4543 | } | 4543 | } |
4544 | 4544 | ||
4545 | class LLViewToggleAdvanced : public view_listener_t | ||
4546 | { | ||
4547 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
4548 | { | ||
4549 | toggle_debug_menus(NULL); | ||
4550 | return true; | ||
4551 | } | ||
4552 | }; | ||
4553 | |||
4554 | class LLViewCheckAdvanced : public view_listener_t | ||
4555 | { | ||
4556 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
4557 | { | ||
4558 | BOOL new_value = gSavedSettings.getBOOL("UseDebugMenus"); | ||
4559 | gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value); | ||
4560 | return true; | ||
4561 | } | ||
4562 | }; | ||
4563 | |||
4545 | void show_debug_menus() | 4564 | void show_debug_menus() |
4546 | { | 4565 | { |
4547 | // this can get called at login screen where there is no menu so only toggle it if one exists | 4566 | // this can get called at login screen where there is no menu so only toggle it if one exists |
@@ -9501,6 +9520,8 @@ void initialize_menus() | |||
9501 | addMenu(new LLViewZoomIn(), "View.ZoomIn"); | 9520 | addMenu(new LLViewZoomIn(), "View.ZoomIn"); |
9502 | addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); | 9521 | addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); |
9503 | addMenu(new LLViewFullscreen(), "View.Fullscreen"); | 9522 | addMenu(new LLViewFullscreen(), "View.Fullscreen"); |
9523 | addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced"); | ||
9524 | |||
9504 | 9525 | ||
9505 | addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); | 9526 | addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); |
9506 | addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter"); | 9527 | addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter"); |
@@ -9511,6 +9532,7 @@ void initialize_menus() | |||
9511 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); | 9532 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); |
9512 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); | 9533 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); |
9513 | addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); | 9534 | addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); |
9535 | addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced"); | ||
9514 | 9536 | ||
9515 | // World menu | 9537 | // World menu |
9516 | addMenu(new LLWorldChat(), "World.Chat"); | 9538 | addMenu(new LLWorldChat(), "World.Chat"); |