summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-06 17:56:47 -0800
commit8d9aec9278f2113e239a32e393aeca7eefd64fbf (patch)
treec50dfd9859aa0fad2f7aff6574c32587dcce3045 /indra/newview/llimfloatercontainer.cpp
parent50615ba69c94441c99f21f861cf0290972162998 (diff)
parent0a21efc7abc62511d1ea789bdb47309a6ed1d72e (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r--indra/newview/llimfloatercontainer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index f85aa9a353..52deae445b 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -331,6 +331,7 @@ void LLIMFloaterContainer::onExpandCollapseButtonClicked()
{
collapseConversationsPane(!mConversationsPane->isCollapsed());
}
+ selectConversation(mSelectedSession);
}
LLIMFloaterContainer* LLIMFloaterContainer::findInstance()