diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-28 19:06:36 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-28 19:06:36 +0300 |
| commit | 14307b099bdb0e7c5b56d052a55e010ecd69b5c3 (patch) | |
| tree | b27c4d741f1a19d2eea2fa827adc0d84d40287cc /indra | |
| parent | 507b66aeb1614a1293890ffacbab53ccecc25e20 (diff) | |
CHUI-361 FIXED (Viewer crash when selecting to start IM with user from right click menu in people floater ): prevent destruction of im_container; suppress warning for the nearby_chat
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index ca77f05545..c6f0607b35 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -223,8 +223,8 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id)); } else - { - LLUUID avatar_id = LLIMModel::getInstance()->getOtherParticipantID(session_id); + { LLUUID avatar_id = session_id.notNull()? + LLIMModel::getInstance()->getOtherParticipantID(session_id) : LLUUID(); LLAvatarIconCtrl::Params icon_params; icon_params.avatar_id = avatar_id; diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index d23ff28fd0..590ce45c33 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -11,6 +11,7 @@ save_rect="true" save_visibility="true" single_instance="true" + reuse_instance="true" title="CONVERSATIONS" width="680"> <string |