diff -r 7ae099f5a764 -r ddf02eed8fe8 doc/contributions.txt --- a/doc/contributions.txt Fri Aug 31 09:01:09 2012 -0400 +++ b/doc/contributions.txt Sat Sep 08 04:26:34 2012 +0200 @@ -740,6 +740,7 @@ STORM-281 MartinRJ Fayray STORM-1845 + STORM-1893 Matthew Anthony Matthew Dowd VWR-1344 diff -r 7ae099f5a764 -r ddf02eed8fe8 indra/newview/llavataractions.cpp --- a/indra/newview/llavataractions.cpp Fri Aug 31 09:01:09 2012 -0400 +++ b/indra/newview/llavataractions.cpp Sat Sep 08 04:26:34 2012 +0200 @@ -459,6 +459,12 @@ if (gIMMgr->hasSession(session_id)) { // we should always get here, but check to verify anyways + LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); + if (im_floater != NULL) + { + im_floater->show(session_id); + im_floater->setVisible(true); + } LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); } }