diff options
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index b56f30312a..4ca9476458 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -78,6 +78,19 @@ LLIMConversation::~LLIMConversation() delete mRefreshTimer; } +//static +LLIMConversation* LLIMConversation::findConversation(const LLUUID& uuid) +{ + return LLFloaterReg::findTypedInstance<LLIMConversation>(uuid.isNull()? "chat_bar" : "impanel", LLSD(uuid)); +}; + +//static +LLIMConversation* LLIMConversation::getConversation(const LLUUID& uuid) +{ + return LLFloaterReg::getTypedInstance<LLIMConversation>(uuid.isNull()? "chat_bar" : "impanel", LLSD(uuid)); +}; + + BOOL LLIMConversation::postBuild() { BOOL result; @@ -140,6 +153,7 @@ void LLIMConversation::draw() } refresh(); + updateHeaderAndToolbar(); // Restart the refresh timer mRefreshTimer->setTimerExpirySec(REFRESH_INTERVAL); @@ -252,7 +266,7 @@ void LLIMConversation::hideAllStandardButtons() void LLIMConversation::updateHeaderAndToolbar() { - bool is_torn_off = isTornOff(); + bool is_torn_off = !getHost(); if (!is_torn_off) { hideAllStandardButtons(); @@ -384,7 +398,7 @@ void LLIMConversation::onClose(bool app_quitting) LLIMFloaterContainer* im_box = LLIMFloaterContainer::findInstance(); if (im_box) { - im_box->removeConversationListItem(this); + im_box->removeConversationListItem(mKey); } } } |