1 files changed, 13 insertions, 6 deletions

diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index ab17196e5f..a17817c764 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -37,6 +37,7 @@
 #include "llinventorymodel.h"
 #include "llscrollcontainer.h"
 #include "lluictrlfactory.h"
+#include <functional>
 #include <set>
 
 class LLInvFVBridge;
@@ -182,7 +183,7 @@ public:
     // Call this method to set the selection.
     void openAllFolders();
     void setSelection(const LLUUID& obj_id, bool take_keyboard_focus);
-    void setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, bool user_action)>& cb);
+    void setSelectCallback(const std::function<void (const std::deque<LLFolderViewItem*>& items, bool user_action)>& cb);
     void clearSelection();
     selected_items_t getSelectedItems() const;
 
@@ -226,6 +227,7 @@ public:
     bool beginIMSession();
     void fileUploadLocation(const LLSD& userdata);
     void setFavoriteFolder();
+    bool isUploadLocationSelected(const LLSD& userdata);
     void openSingleViewInventory(LLUUID folder_id = LLUUID());
     void purgeSelectedItems();
     bool attachObject(const LLSD& userdata);
@@ -252,7 +254,8 @@ public:
                                                     bool reset_filter = false);
     static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
     void addItemID(const LLUUID& id, LLFolderViewItem* itemp);
-    void removeItemID(const LLUUID& id);
+    virtual void removeItemID(const LLUUID& id);
+    virtual bool isInRootContent(const LLUUID& id, LLFolderViewItem* view_item) { return false; }
     LLFolderViewItem* getItemByID(const LLUUID& id);
     LLFolderViewFolder* getFolderByID(const LLUUID& id);
     void setSelectionByID(const LLUUID& obj_id, bool take_keyboard_focus);
@@ -298,7 +301,7 @@ protected:
     LLPointer<LLFolderViewGroupedItemBridge> mGroupedItemBridge;
     Params                      mParams;    // stored copy of parameter block
 
-    std::map<LLUUID, LLFolderViewItem*> mItemMap;
+    std::unordered_map<LLUUID, LLFolderViewItem*> mItemMap;
     /**
      * Pointer to LLInventoryFolderViewModelBuilder.
      *
@@ -335,6 +338,8 @@ public:
 protected:
     // Builds the UI.  Call this once the inventory is usable.
     void                initializeViews(F64 max_time);
+    virtual void        initRootContent();
+    virtual void        findAndInitRootContent(const LLUUID& root_id) {};
 
     // Specific inventory colors
     static bool                 sColorSetInitialized;
@@ -371,8 +376,8 @@ protected:
     virtual LLFolderViewFolder* createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop);
     virtual LLFolderViewItem*   createFolderViewItem(LLInvFVBridge * bridge);
 
-    boost::function<void(const std::deque<LLFolderViewItem*>& items, bool user_action)> mSelectionCallback;
-private:
+    std::function<void(const std::deque<LLFolderViewItem*>& items, bool user_action)> mSelectionCallback;
+
     // buildViewsTree does not include some checks and is meant
     // for recursive use, use buildNewViews() for first call
     LLFolderViewItem*           buildViewsTree(const LLUUID& id,
@@ -395,6 +400,8 @@ private:
     EViewsInitializationState   mViewsInitialized; // Whether views have been generated
     F64                         mBuildViewsEndTime; // Stop building views past this timestamp
     std::deque<LLUUID>          mBuildViewsQueue;
+    std::deque<LLUUID>          mBuildRootQueue;
+
 };
 
 
@@ -431,7 +438,7 @@ public:
     std::list<LLUUID> getNavBackwardList() { return mBackwardFolders; }
     std::list<LLUUID> getNavForwardList() { return mForwardFolders; }
 
-    typedef boost::function<void()> root_changed_callback_t;
+    typedef std::function<void()> root_changed_callback_t;
     boost::signals2::connection setRootChangedCallback(root_changed_callback_t cb);
 
 protected: