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

Pull merge from richard/viewer-chui

meow-7.2.2
Merov Linden 2012-06-27 15:34:17 -07:00
parent d470632799 3385a63989
commit ea77a959b7
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llnearbychat.cpp
View File

@ -131,6 +131,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& key)
mSpeakerMgr(NULL),
mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT)
{
setIsChrome(TRUE);
mKey = LLSD();
mIsNearbyChat = true;
mSpeakerMgr = LLLocalSpeakerMgr::getInstance();
@ -394,6 +395,26 @@ LLNearbyChat* LLNearbyChat::getInstance()
return LLFloaterReg::getTypedInstance<LLNearbyChat>("chat_bar");
}
void LLNearbyChat::show()
{
// Get the floater
LLNearbyChat* floater = LLNearbyChat::getInstance();
if (floater)
{
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);
}
}
void LLNearbyChat::showHistory()
{
@ -773,6 +794,7 @@ void LLNearbyChat::startChat(const char* line)
if (cb )
{
cb->show();
cb->setVisible(TRUE);
cb->setFocus(TRUE);
cb->mChatBox->setFocus(TRUE);

1
indra/newview/llnearbychat.h
View File

@ -65,6 +65,7 @@ public:
static LLNearbyChat* getInstance();
void addToHost();
void show();
/** @param archive true - to save a message to the chat history log */
void addMessage (const LLChat& message,bool archive = true, const LLSD &args = LLSD());