livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
AlexanderP ProductEngine 2012-09-28 19:06:36 +03:00
parent 507b66aeb1
commit 14307b099b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llimfloatercontainer.cpp
View File

@ -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;

1
indra/newview/skins/default/xui/en/floater_im_container.xml
View File

@ -11,6 +11,7 @@
save_rect="true"
save_visibility="true"
single_instance="true"
reuse_instance="true"
title="CONVERSATIONS"
width="680">
<string