diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:49:49 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:49:49 -0700 |
| commit | 1018b36b87d0d19e020c1e416c33c76b06125633 (patch) | |
| tree | ef111a3f5b634ddc3aa23f6e6c3505142e54261a /indra/newview/llviewermenu.cpp | |
| parent | 91aa2f37f409b7755d460c5a8e9c8d6a9a50557c (diff) | |
| parent | 76001ce3f0b53391c674f315855017b78a3a2873 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8a5928f4e9..5536951ce6 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -113,7 +113,6 @@ #include "llfloaterland.h" #include "llfloaterlandholdings.h" #include "llfloatermap.h" -#include "llfloatermute.h" #include "llfloateropenobject.h" #include "llfloaterperms.h" #include "llfloaterpostprocess.h" @@ -147,6 +146,7 @@ #include "llfloaterinventory.h" #include "llkeyboard.h" #include "llpanellogin.h" +#include "llpanelblockedlist.h" #include "llmenucommands.h" #include "llmenugl.h" #include "llmimetypes.h" @@ -2896,7 +2896,7 @@ class LLObjectMute : public view_listener_t else { LLMuteList::getInstance()->add(mute); - LLFloaterReg::showInstance("mute"); + LLPanelBlockedList::showPanelAndSelect(mute.mID); } return true; |