From 849ce1e30c080d71e4af8dc8f24720274a126f4c Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 6 May 2014 11:28:13 +0300 Subject: MAINT-423 FIXED Unminimize session floater and select this session when sharing initiated. --- indra/newview/llavataractions.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 54b9336d93..0d22c15b4f 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -525,6 +525,14 @@ void LLAvatarActions::share(const LLUUID& id) { // we should always get here, but check to verify anyways LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); + + LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id); + if (session_floater && session_floater->isMinimized()) + { + session_floater->setMinimized(false); + } + LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance("im_container"); + im_container->selectConversationPair(session_id, true); } } -- cgit v1.2.3