summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-07-17 20:48:22 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-07-17 20:48:22 +0300
commit8349b8234fba4df5a3e4b36e8f226d85e30d8a4c (patch)
tree0bc6dc162bb0cffd35bf1d6e650a9c27fa199309
parent170e01e7eb0f3785491d567b5734e8d493ecce22 (diff)
CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from inventory onto avatar’s name in resident picker)
-rwxr-xr-xindra/newview/llfloaterimcontainer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 29216f8d9a..396e31dd27 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -116,6 +116,10 @@ void LLFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::str
void LLFloaterIMContainer::sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)
{
+ if(!isInVisibleChain())
+ {
+ setVisibleAndFrontmost(false);
+ }
selectConversationPair(session_id, true);
collapseMessagesPane(false);
}