merging in latest changes

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 14ed0b3c3e..cf4d054dd5 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -1113,6 +1113,9 @@ void LLIMFloaterContainer::setItemSelect(const LLUUID& session_id)
             mSelectedSession = session_id;
             LLFolderViewItem* widget = mConversationsWidgets[session_id];
             (widget->getRoot())->setSelection(widget, FALSE, FALSE);
+
+			// Scroll to selected item
+			mConversationsRoot->scrollToShowSelection();
         }
     }
 }
@@ -1228,6 +1231,9 @@ void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid, bool isWi
 	// set the widget to minimized mode if conversations pane is collapsed
 	widget->toggleMinimizedMode(mConversationsPane->isCollapsed());
 
+	// scroll to newly added item
+	mConversationsRoot->scrollToShowSelection();
+
 	return;
 }