Skip to content
Snippets Groups Projects
Commit 1002980a authored by Paul Guslisty's avatar Paul Guslisty
Browse files

Fixed critical bug EXT - 4906 (Viewer crashes after group message was sent if...

Fixed critical bug EXT - 4906 (Viewer crashes after group message was sent if close IM chat from message sender previously)

--HG--
branch : product-engine
parent 5138d54b
No related branches found
No related tags found
No related merge requests found
...@@ -100,6 +100,7 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, ...@@ -100,6 +100,7 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
icon = LLUICtrlFactory::instance().createWidget<LLGroupIconCtrl>(icon_params); icon = LLUICtrlFactory::instance().createWidget<LLGroupIconCtrl>(icon_params);
mSessions[session_id] = floaterp; mSessions[session_id] = floaterp;
floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id));
} }
else else
{ {
...@@ -110,10 +111,16 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, ...@@ -110,10 +111,16 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
icon = LLUICtrlFactory::instance().createWidget<LLAvatarIconCtrl>(icon_params); icon = LLUICtrlFactory::instance().createWidget<LLAvatarIconCtrl>(icon_params);
mSessions[avatar_id] = floaterp; mSessions[avatar_id] = floaterp;
floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, avatar_id));
} }
mTabContainer->setTabImage(floaterp, icon); mTabContainer->setTabImage(floaterp, icon);
} }
void LLIMFloaterContainer::onCloseFloater(LLUUID& id)
{
mSessions.erase(id);
}
void LLIMFloaterContainer::processProperties(void* data, enum EAvatarProcessorType type) void LLIMFloaterContainer::processProperties(void* data, enum EAvatarProcessorType type)
{ {
if (APT_PROPERTIES == type) if (APT_PROPERTIES == type)
......
...@@ -51,6 +51,7 @@ class LLIMFloaterContainer : public LLMultiFloater, public LLAvatarPropertiesObs ...@@ -51,6 +51,7 @@ class LLIMFloaterContainer : public LLMultiFloater, public LLAvatarPropertiesObs
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onOpen(const LLSD& key);
void onCloseFloater(LLUUID& id);
/*virtual*/ void addFloater(LLFloater* floaterp, /*virtual*/ void addFloater(LLFloater* floaterp,
BOOL select_added_floater, BOOL select_added_floater,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment