diff options
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 486e4f1..4081e97 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -2087,10 +2087,16 @@ class LLObjectMute : public view_listener_t | |||
2087 | } | 2087 | } |
2088 | else | 2088 | else |
2089 | { | 2089 | { |
2090 | LLMuteList::getInstance()->add(mute); | 2090 | if( LLMute::AGENT == type ) |
2091 | LLFloaterMute::showInstance(); | 2091 | { |
2092 | LLMuteList::getInstance()->addMuteAgentConfirm(mute); | ||
2093 | } | ||
2094 | else | ||
2095 | { | ||
2096 | // must be an object. | ||
2097 | LLMuteList::getInstance()->addMuteObjectConfirm(mute); | ||
2098 | } | ||
2092 | } | 2099 | } |
2093 | |||
2094 | return true; | 2100 | return true; |
2095 | } | 2101 | } |
2096 | }; | 2102 | }; |
@@ -3262,7 +3268,7 @@ class LLViewFullscreen : public view_listener_t | |||
3262 | { | 3268 | { |
3263 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 3269 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
3264 | { | 3270 | { |
3265 | gViewerWindow->toggleFullscreen(TRUE); | 3271 | gViewerWindow->toggleFullscreenConfirm(); |
3266 | return true; | 3272 | return true; |
3267 | } | 3273 | } |
3268 | }; | 3274 | }; |
@@ -4686,7 +4692,7 @@ class LLWorldTeleportHome : public view_listener_t | |||
4686 | { | 4692 | { |
4687 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 4693 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
4688 | { | 4694 | { |
4689 | gAgent.teleportHome(); | 4695 | gAgent.teleportHomeConfirm(); |
4690 | return true; | 4696 | return true; |
4691 | } | 4697 | } |
4692 | }; | 4698 | }; |
@@ -7352,7 +7358,7 @@ class LLEditTakeOff : public view_listener_t | |||
7352 | } | 7358 | } |
7353 | else if (clothing == "all") | 7359 | else if (clothing == "all") |
7354 | { | 7360 | { |
7355 | LLAgent::userRemoveAllClothes(NULL); | 7361 | LLAgent::userRemoveAllClothesConfirm(); |
7356 | } | 7362 | } |
7357 | return true; | 7363 | return true; |
7358 | } | 7364 | } |