summaryrefslogtreecommitdiff
path: root/indra/newview/llimconversation.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-25 15:20:52 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-25 15:20:52 -0700
commit41e965c12e29136d2b81a9b67d6b6c9af4fb2092 (patch)
treee204cfccbf13d604cbcdbb9a82cad55aad1b5611 /indra/newview/llimconversation.cpp
parent75804ef2b918906108af4a3b9ceb6cbfc1354393 (diff)
CHUI-139 : Hide torn off floaters when hiding conversation list; make nearby chat always present; leave conversation list around when all torn off
Diffstat (limited to 'indra/newview/llimconversation.cpp')
-rw-r--r--indra/newview/llimconversation.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index bbbc9fcffd..cbebf3edd3 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -106,6 +106,10 @@ BOOL LLIMConversation::postBuild()
if (isChatMultiTab())
{
+ if (mIsNearbyChat)
+ {
+ setCanClose(FALSE);
+ }
return LLFloater::postBuild();
}
else
@@ -246,7 +250,7 @@ void LLIMConversation::updateHeaderAndToolbar()
mTearOffBtn->setImageOverlay(getString(is_hosted ? "tear_off_icon" : "return_icon"));
- mCloseBtn->setVisible(is_hosted);
+ mCloseBtn->setVisible(is_hosted && !mIsNearbyChat);
enableDisableCallBtn();