From 8b2ed2e2050fcb8836be120902f44417613adb13 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Fri, 28 Sep 2012 18:22:00 +0300 Subject: CHUI-370, CHUI-372 ADDITIONAL FIX (Viewer crash when voice calling another user from people panel then opening conversation floater or when starting a IM chat when conversation floater has not been previously opened): fixed nearby chat positioning --- indra/newview/llimfloatercontainer.cpp | 1 + indra/newview/llnearbychat.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 indra/newview/llimfloatercontainer.cpp diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp old mode 100755 new mode 100644 index e64247cd60..a74ebdae7a --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -432,6 +432,7 @@ void LLIMFloaterContainer::setVisible(BOOL visible) // *TODO: find a way to move this to XML as a default panel or something like that LLSD name("nearby_chat"); LLFloaterReg::toggleInstanceOrBringToFront(name); + LLFloaterReg::getTypedInstance("nearby_chat")->addToHost(); } } diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 2982f30102..4b35092f2d 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -310,7 +310,6 @@ void LLNearbyChat::addToHost() // virtual void LLNearbyChat::onOpen(const LLSD& key) { - addToHost(); LLIMConversation::onOpen(key); showTranslationCheckbox(LLTranslate::isTranslationConfigured()); } -- cgit v1.2.3