SL-19795 Creating folders in combination mode does not scroll to new folder

2 files changed, 10 insertions, 1 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index bd15e55b9a..9827fa8c5c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2132,6 +2132,15 @@ void LLInventorySingleFolderPanel::setSelectCallback(const boost::function<void(
     }
 }
 
+void LLInventorySingleFolderPanel::setScroller(LLScrollContainer* scroller)
+{
+    mExternalScroller = scroller;
+    if (mFolderRoot.get())
+    {
+        mFolderRoot.get()->setScrollContainer(mExternalScroller);
+    }
+}
+
 void LLInventorySingleFolderPanel::initFromParams(const Params& p)
 {
     mFolderID = gInventory.getRootFolderID();
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 2754d79fbe..8d3edebcb4 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -422,7 +422,7 @@ public:
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
     void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb);
-    void setScroller(LLScrollContainer* scroller) { mExternalScroller = scroller; }
+    void setScroller(LLScrollContainer* scroller);
 
     typedef boost::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);