summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-07-12 19:06:29 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-07-12 19:06:29 +0300
commitaf7de5dd9373a5a15c4d5ea107782e50eb3ce62c (patch)
tree1b5be7e197ecb0780df0c222bb9e7466842898b6 /indra/newview
parent6dff1477d5898c54ea0a08aa72bd099b628433e7 (diff)
CHUI-170 Workaround for the permanently showing of the nearbychat's name in a conversations list when that floater is torn-off
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnearbychat.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 384762549a..1c81cdc4bc 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -363,6 +363,9 @@ void LLNearbyChat::addToHost()
LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
if (im_box)
{
+ // Make sure the Nearby Chat is present in the conversations list
+ im_box->addConversationListItem(getTitle(), getKey(), this);
+
if (gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
{
im_box->addFloater(this, TRUE, LLTabContainer::END);