diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-09 16:48:33 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-09 16:48:33 +0300 |
| commit | 6cf49a4a715c9f498d4b063f8d74e295be1f418c (patch) | |
| tree | 25031d63658434e1a70b29b6c06c0302831605bf /indra/newview/llnearbychat.cpp | |
| parent | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (diff) | |
CHUI-171 WIP (Conversation not automatically readded to conversation window listing when open) - removal of the dependence between items of the conversations list and conversation's floaters.
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 8f0e6b4c83..fa8e423056 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -152,7 +152,7 @@ BOOL LLNearbyChat::postBuild() // title must be defined BEFORE call addConversationListItem() because // it is used for show the item's name in the conversations list - setTitle(getString("NearbyChatTitle")); + setTitle(LLTrans::getString("NearbyChatTitle")); addToHost(); @@ -177,16 +177,13 @@ BOOL LLNearbyChat::postBuild() loadHistory(); } - // added row in the conversations list when nearby chat is tear-off - LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance(); - im_box->addConversationListItem(getTitle(), LLSD(), this); - return result; } // virtual void LLNearbyChat::refresh() { + updateHeaderAndToolbar(); displaySpeakingIndicator(); updateCallBtnState(LLVoiceClient::getInstance()->getUserPTTState()); @@ -386,7 +383,7 @@ void LLNearbyChat::onChatFontChange(LLFontGL* fontp) //static LLNearbyChat* LLNearbyChat::getInstance() { - return LLFloaterReg::getTypedInstance<LLNearbyChat>("chat_bar"); + return LLFloaterReg::getTypedInstance<LLNearbyChat>("chat_bar", LLSD(LLUUID::null)); } void LLNearbyChat::show() |