diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-28 18:22:00 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-28 18:22:00 +0300 |
| commit | 8b2ed2e2050fcb8836be120902f44417613adb13 (patch) | |
| tree | 883cefd7cf95e7d8776a7278b25589a8d661091d /indra | |
| parent | 3e3735c16b47402d8fc2da8afa6086638fb5b948 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llimfloatercontainer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index e64247cd60..a74ebdae7a 100755..100644 --- 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<LLNearbyChat>("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()); } |