diff options
Diffstat (limited to '')
-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 864c6f5..9374a36 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -2091,10 +2091,16 @@ class LLObjectMute : public view_listener_t | |||
2091 | } | 2091 | } |
2092 | else | 2092 | else |
2093 | { | 2093 | { |
2094 | LLMuteList::getInstance()->add(mute); | 2094 | if( LLMute::AGENT == type ) |
2095 | LLFloaterMute::showInstance(); | 2095 | { |
2096 | LLMuteList::getInstance()->addMuteAgentConfirm(mute); | ||
2097 | } | ||
2098 | else | ||
2099 | { | ||
2100 | // must be an object. | ||
2101 | LLMuteList::getInstance()->addMuteObjectConfirm(mute); | ||
2102 | } | ||
2096 | } | 2103 | } |
2097 | |||
2098 | return true; | 2104 | return true; |
2099 | } | 2105 | } |
2100 | }; | 2106 | }; |
@@ -3240,7 +3246,7 @@ class LLViewFullscreen : public view_listener_t | |||
3240 | { | 3246 | { |
3241 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 3247 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
3242 | { | 3248 | { |
3243 | gViewerWindow->toggleFullscreen(TRUE); | 3249 | gViewerWindow->toggleFullscreenConfirm(); |
3244 | return true; | 3250 | return true; |
3245 | } | 3251 | } |
3246 | }; | 3252 | }; |
@@ -4664,7 +4670,7 @@ class LLWorldTeleportHome : public view_listener_t | |||
4664 | { | 4670 | { |
4665 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 4671 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
4666 | { | 4672 | { |
4667 | gAgent.teleportHome(); | 4673 | gAgent.teleportHomeConfirm(); |
4668 | return true; | 4674 | return true; |
4669 | } | 4675 | } |
4670 | }; | 4676 | }; |
@@ -7182,7 +7188,7 @@ class LLEditTakeOff : public view_listener_t | |||
7182 | } | 7188 | } |
7183 | else if (clothing == "all") | 7189 | else if (clothing == "all") |
7184 | { | 7190 | { |
7185 | LLAgent::userRemoveAllClothes(NULL); | 7191 | LLAgent::userRemoveAllClothesConfirm(); |
7186 | } | 7192 | } |
7187 | return true; | 7193 | return true; |
7188 | } | 7194 | } |