diff options
author | Jacek Antonelli | 2009-06-01 00:27:32 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-06-01 01:16:57 -0500 |
commit | c3f2d6b01a3fb000f9d76de92e109c29efa75a6d (patch) | |
tree | 9f4381393e8894abdb6569f79116b05bbe812595 /linden/indra/newview/llviewermenu.cpp | |
parent | Added a confirmation dialog for Take Off All Clothes. (diff) | |
download | meta-impy-c3f2d6b01a3fb000f9d76de92e109c29efa75a6d.zip meta-impy-c3f2d6b01a3fb000f9d76de92e109c29efa75a6d.tar.gz meta-impy-c3f2d6b01a3fb000f9d76de92e109c29efa75a6d.tar.bz2 meta-impy-c3f2d6b01a3fb000f9d76de92e109c29efa75a6d.tar.xz |
Added confirmation dialogs for Mute from pie menu.
Dialog is for muting avatars and objects from the pie menu only.
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index d477b0c..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 | }; |