1 files changed, 1 insertions, 22 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 9827fa8c5c..a76769d25a 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -2107,7 +2107,6 @@ static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_f
 
 LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
     : LLInventoryPanel(params)
-    , mExternalScroller(NULL)
 {
     mBuildChildrenViews = false;
     getFilter().setSingleFolderMode(true);
@@ -2132,15 +2131,6 @@ 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();
@@ -2247,18 +2237,7 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
             mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params);
             addChild(mScroller);
             mScroller->addChild(mFolderRoot.get());
-            if (!mExternalScroller)
-            {
-                mFolderRoot.get()->setScrollContainer(mScroller);
-            }
-            else
-            {
-                // Hack to use exteranl scroll in combination view
-                // Todo: find a way to avoid this
-                // ideally combination view should be own inventory panel
-                // instead of piggy backing on two different ones
-                mFolderRoot.get()->setScrollContainer(mExternalScroller);
-            }
+            mFolderRoot.get()->setScrollContainer(mScroller);
             mFolderRoot.get()->setFollowsAll();
             mFolderRoot.get()->addChild(mFolderRoot.get()->mStatusTextBox);