diff options
author | McCabe Maxsted | 2010-03-30 23:39:25 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-03-30 23:39:25 -0700 |
commit | 7e458d1989ea06d06c64db4732619e03b59cf223 (patch) | |
tree | 2b4fc86591d3834baaea146d0b88b843d95ed9a2 /linden/indra/newview/llviewermenu.cpp | |
parent | Ported clientside AO from Emerald r1633 (diff) | |
download | meta-impy-7e458d1989ea06d06c64db4732619e03b59cf223.zip meta-impy-7e458d1989ea06d06c64db4732619e03b59cf223.tar.gz meta-impy-7e458d1989ea06d06c64db4732619e03b59cf223.tar.bz2 meta-impy-7e458d1989ea06d06c64db4732619e03b59cf223.tar.xz |
Made the AO toggle and work like an actual menu check
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 7a2cddf..7697f77 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -8598,7 +8598,7 @@ class LLAdvancedTogglePhantom: public view_listener_t | |||
8598 | }; | 8598 | }; |
8599 | 8599 | ||
8600 | 8600 | ||
8601 | class LLAO : public view_listener_t | 8601 | class LLViewToggleAO : public view_listener_t |
8602 | { | 8602 | { |
8603 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 8603 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
8604 | { | 8604 | { |
@@ -8607,6 +8607,16 @@ class LLAO : public view_listener_t | |||
8607 | } | 8607 | } |
8608 | }; | 8608 | }; |
8609 | 8609 | ||
8610 | class LLViewCheckAO: public view_listener_t | ||
8611 | { | ||
8612 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
8613 | { | ||
8614 | gMenuHolder->findControl(userdata["control"].asString())->setValue(LLFloaterAO::getInstance()); | ||
8615 | return true; | ||
8616 | } | ||
8617 | }; | ||
8618 | |||
8619 | |||
8610 | class LLAdvancedCheckPhantom: public view_listener_t | 8620 | class LLAdvancedCheckPhantom: public view_listener_t |
8611 | { | 8621 | { |
8612 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 8622 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
@@ -10731,6 +10741,7 @@ void initialize_menus() | |||
10731 | addMenu(new LLZoomer(1/1.2f), "View.ZoomIn"); | 10741 | addMenu(new LLZoomer(1/1.2f), "View.ZoomIn"); |
10732 | addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault"); | 10742 | addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault"); |
10733 | addMenu(new LLViewFullscreen(), "View.Fullscreen"); | 10743 | addMenu(new LLViewFullscreen(), "View.Fullscreen"); |
10744 | addMenu(new LLViewToggleAO(), "View.ToggleAO"); | ||
10734 | addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced"); | 10745 | addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced"); |
10735 | 10746 | ||
10736 | addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); | 10747 | addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); |
@@ -10743,7 +10754,7 @@ void initialize_menus() | |||
10743 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); | 10754 | addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); |
10744 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); | 10755 | addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); |
10745 | addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); | 10756 | addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); |
10746 | addMenu(new LLAO(), "View.AO"); | 10757 | addMenu(new LLViewCheckAO(), "View.CheckAO"); |
10747 | addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced"); | 10758 | addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced"); |
10748 | 10759 | ||
10749 | // World menu | 10760 | // World menu |