From 72f6bebe59f5f900af02a4d234a4091a3e034529 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Fri, 14 Sep 2012 16:11:42 +0300 Subject: 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 --- indra/newview/llimconversation.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llimconversation.cpp') 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) { -- cgit v1.2.3