summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-11-21 12:30:12 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-11-21 12:30:12 +0200
commit2dea7a52f616665040d4faff2339e78596a31b90 (patch)
tree35cb5359ac2c44692e2219971126d16c1f5a3a20 /indra/newview
parent668761e1196517913688bab6763bd9d2e11359b0 (diff)
CHUI-535 (Starting a conversation with a user that you have an existing conversation with can cause the conversation list and message panel to be out of synch)
fixed
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 39cd16acfa..f93f741b3f 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -106,7 +106,7 @@ 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)
{
- selectConversation(session_id);
+ selectConversationPair(session_id, true);
}
void LLFloaterIMContainer::sessionVoiceOrIMStarted(const LLUUID& session_id)