diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-27 20:04:26 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-27 20:04:26 +0300 |
| commit | 78e6b910a5012352ab265e52a78b0d340ac7ce27 (patch) | |
| tree | c07c49b0f82dbea0d911fa52a8c6cf5ca492b406 /indra | |
| parent | 483cbd74d78b8fa7ce94e3d3c7d264bcdaa331b5 (diff) | |
CHUI-370, CHUI-372 FIXED 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:
connecting floater to the host postponed until the end of its initialization
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 75c691d99b..2982f30102 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -122,8 +122,6 @@ BOOL LLNearbyChat::postBuild() // it is used for show the item's name in the conversations list setTitle(LLTrans::getString("NearbyChatTitle")); - addToHost(); - //for menu LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar; LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar; @@ -312,6 +310,7 @@ void LLNearbyChat::addToHost() // virtual void LLNearbyChat::onOpen(const LLSD& key) { + addToHost(); LLIMConversation::onOpen(key); showTranslationCheckbox(LLTranslate::isTranslationConfigured()); } |