livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-162 : Simplified the nearby chat show method following CHUI-139 fixes

meow-7.2.2
Merov Linden 2012-06-27 15:55:09 -07:00
parent ea77a959b7
commit c9da4d0a6d
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llnearbychat.cpp
View File

@ -397,23 +397,11 @@ LLNearbyChat* LLNearbyChat::getInstance()
void LLNearbyChat::show()
{
// Get the floater
LLNearbyChat* floater = LLNearbyChat::getInstance();
if (floater)
if (isChatMultiTab())
{
if(isChatMultiTab())
{
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
// Add a conversation list item in the left pane: nothing will be done if already in there
// but relevant clean up will be done to ensure consistency of the conversation list
floater_container->addConversationListItem(floater->getTitle(), LLUUID(), floater);
floater->openFloater(floater->getKey());
}
floater->setVisible(TRUE);
openFloater(getKey());
}
setVisible(TRUE);
}
void LLNearbyChat::showHistory()