From 9993fa550ab3716e583a6d5699f27974c3a95eb9 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Tue, 12 Jun 2012 21:56:00 +0300 Subject: CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the torn-off button's states --- indra/newview/llnearbychat.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'indra/newview/llnearbychat.cpp') diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index e35dbf21d4..2f5a3a8767 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -126,7 +126,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& key) : LLIMConversation(key), mChatBox(NULL), mChatHistory(NULL), - mOutputMonitor(NULL), + //mOutputMonitor(NULL), mSpeakerMgr(NULL), mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) { @@ -152,8 +152,8 @@ BOOL LLNearbyChat::postBuild() mChatBox->setEnableLineHistory(TRUE); mChatBox->setFont(LLViewerChat::getChatFont()); - mOutputMonitor = getChild("chat_zone_indicator"); - mOutputMonitor->setVisible(FALSE); +// mOutputMonitor = getChild("chat_zone_indicator"); +// mOutputMonitor->setVisible(FALSE); // Register for font change notifications LLViewerChat::setFontChangedCallback(boost::bind(&LLNearbyChat::onChatFontChange, this, _1)); @@ -184,6 +184,8 @@ BOOL LLNearbyChat::postBuild() loadHistory(); } + setTitle(getString("NearbyChatTitle")); + return LLIMConversation::postBuild(); } @@ -718,12 +720,12 @@ void LLNearbyChat::displaySpeakingIndicator() if (!id.isNull()) { - mOutputMonitor->setVisible(TRUE); - mOutputMonitor->setSpeakerId(id); + //mOutputMonitor->setVisible(TRUE); + //mOutputMonitor->setSpeakerId(id); } else { - mOutputMonitor->setVisible(FALSE); + //mOutputMonitor->setVisible(FALSE); } } -- cgit v1.2.3 From b50349ab8490c9b48e9cf89b8de186b528d90e60 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 13 Jun 2012 19:26:17 +0300 Subject: CHUI-120 WIP Fix for crash after closing the chat floater. --- indra/newview/llnearbychat.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llnearbychat.cpp') diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 2f5a3a8767..cd181ce865 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -404,6 +404,10 @@ void LLNearbyChat::showTranslationCheckbox(BOOL show) BOOL LLNearbyChat::tick() { + // This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater + // via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy(). + if (isDead()) return false; + BOOL parents_retcode = LLIMConversation::tick(); displaySpeakingIndicator(); -- cgit v1.2.3