summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-09-14 16:11:42 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-09-14 16:11:42 +0300
commit72f6bebe59f5f900af02a4d234a4091a3e034529 (patch)
treed92746c8ba502af34362ec90b9a3420902e0d872 /indra/newview
parent76827f03d429e3ce80def7a49c2657a1cb1179d4 (diff)
CHUI-261 Additional fix (Nearby chat controls and log are not visible on next login after tearing off and docking nearby chat in previous session): prevent start LLNearbyChat before start its container
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimconversation.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index bab588126f..a2efe63546 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -381,6 +381,9 @@ void LLIMConversation::hideAllStandardButtons()
void LLIMConversation::updateHeaderAndToolbar()
{
+ // prevent start conversation before its container
+ LLIMFloaterContainer::getInstance();
+
bool is_torn_off = !getHost();
if (!is_torn_off)
{