summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-08 14:28:31 -0700
commit76001ce3f0b53391c674f315855017b78a3a2873 (patch)
treea2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/newview/llfloaterchat.cpp
parent40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff)
parent2ed83382a1dd84575536c16e248a602ba96755cd (diff)
Merge
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
-rw-r--r--indra/newview/llfloaterchat.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 0dee3a1e83..14fb93df61 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -47,7 +47,6 @@
#include "llconsole.h"
#include "llfloateractivespeakers.h"
#include "llfloaterchatterbox.h"
-#include "llfloatermute.h"
#include "llfloaterreg.h"
#include "llfloaterscriptdebug.h"
#include "llkeyboard.h"
@@ -56,6 +55,7 @@
//#include "llresizehandle.h"
#include "llchatbar.h"
#include "llrecentpeople.h"
+#include "llpanelblockedlist.h"
#include "llstatusbar.h"
#include "llviewertexteditor.h"
#include "llviewergesture.h" // for triggering gestures
@@ -280,7 +280,7 @@ void LLFloaterChat::onClickMute(void *data)
LLMute mute(id);
mute.setFromDisplayName(name);
LLMuteList::getInstance()->add(mute);
- LLFloaterReg::showInstance("mute");
+ LLPanelBlockedList::showPanelAndSelect(mute.mID);
}
//static