Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 1071 insertions, 1071 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 8450c344a7..ad9099cd6e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1,25 +1,25 @@
-/* 
+/*
  * @file llinventorypanel.cpp
  * @brief Implementation of the inventory panel and associated stuff.
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -69,7 +69,7 @@ const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("Recent
 const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");
 static const LLInventoryFolderViewModelBuilder INVENTORY_BRIDGE_BUILDER;
 
-// statics 
+// statics
 bool LLInventoryPanel::sColorSetInitialized = false;
 LLUIColor LLInventoryPanel::sDefaultColor;
 LLUIColor LLInventoryPanel::sDefaultHighlightColor;
@@ -87,14 +87,14 @@ const LLColor4U DEFAULT_WHITE(255, 255, 255);
 class LLInventoryPanelObserver : public LLInventoryObserver
 {
 public:
-	LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {}
-	virtual ~LLInventoryPanelObserver() {}
-	virtual void changed(U32 mask) 
-	{
-		mIP->modelChanged(mask);
-	}
+    LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {}
+    virtual ~LLInventoryPanelObserver() {}
+    virtual void changed(U32 mask)
+    {
+        mIP->modelChanged(mask);
+    }
 protected:
-	LLInventoryPanel* mIP;
+    LLInventoryPanel* mIP;
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -113,80 +113,80 @@ protected:
 class LLInvPanelComplObserver : public LLInventoryCompletionObserver
 {
 public:
-	typedef boost::function<void()> callback_t;
+    typedef boost::function<void()> callback_t;
 
-	LLInvPanelComplObserver(callback_t cb)
-	:	mCallback(cb)
-	{
-	}
+    LLInvPanelComplObserver(callback_t cb)
+    :   mCallback(cb)
+    {
+    }
 
-	void reset();
+    void reset();
 
 private:
-	/*virtual*/ void done();
+    /*virtual*/ void done();
 
-	/// Called when all the items are complete.
-	callback_t	mCallback;
+    /// Called when all the items are complete.
+    callback_t  mCallback;
 };
 
 void LLInvPanelComplObserver::reset()
 {
-	mIncomplete.clear();
-	mComplete.clear();
+    mIncomplete.clear();
+    mComplete.clear();
 }
 
 void LLInvPanelComplObserver::done()
 {
-	mCallback();
+    mCallback();
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLInventoryPanel
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :	
-	LLPanel(p),
-	mInventoryObserver(NULL),
-	mCompletionObserver(NULL),
-	mScroller(NULL),
-	mSortOrderSetting(p.sort_order_setting),
-	mInventory(p.inventory), //inventory("", &gInventory)
-	mAcceptsDragAndDrop(p.accepts_drag_and_drop),
-	mAllowMultiSelect(p.allow_multi_select),
-	mAllowDrag(p.allow_drag),
-	mShowItemLinkOverlays(p.show_item_link_overlays),
-	mShowEmptyMessage(p.show_empty_message),
-	mSuppressFolderMenu(p.suppress_folder_menu),
-	mSuppressOpenItemAction(false),
-	mBuildViewsOnInit(p.preinitialize_views),
-	mViewsInitialized(VIEWS_UNINITIALIZED),
-	mInvFVBridgeBuilder(NULL),
-	mInventoryViewModel(p.name),
-	mGroupedItemBridge(new LLFolderViewGroupedItemBridge),
-	mFocusSelection(false),
+LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
+    LLPanel(p),
+    mInventoryObserver(NULL),
+    mCompletionObserver(NULL),
+    mScroller(NULL),
+    mSortOrderSetting(p.sort_order_setting),
+    mInventory(p.inventory), //inventory("", &gInventory)
+    mAcceptsDragAndDrop(p.accepts_drag_and_drop),
+    mAllowMultiSelect(p.allow_multi_select),
+    mAllowDrag(p.allow_drag),
+    mShowItemLinkOverlays(p.show_item_link_overlays),
+    mShowEmptyMessage(p.show_empty_message),
+    mSuppressFolderMenu(p.suppress_folder_menu),
+    mSuppressOpenItemAction(false),
+    mBuildViewsOnInit(p.preinitialize_views),
+    mViewsInitialized(VIEWS_UNINITIALIZED),
+    mInvFVBridgeBuilder(NULL),
+    mInventoryViewModel(p.name),
+    mGroupedItemBridge(new LLFolderViewGroupedItemBridge),
+    mFocusSelection(false),
     mBuildChildrenViews(true),
     mRootInited(false)
 {
-	mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
-
-	if (!sColorSetInitialized)
-	{
-		sDefaultColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
-		sDefaultHighlightColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
-		sLibraryColor = LLUIColorTable::instance().getColor("InventoryItemLibraryColor", DEFAULT_WHITE);
-		sLinkColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
-		sColorSetInitialized = true;
-	}
-	
-	// context menu callbacks
-	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryPanel::doToSelected, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH));
-	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND));
-	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLInventoryPanel::doCreate, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&LLInventoryPanel::attachObject, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
-	mCommitCallbackRegistrar.add("Inventory.Share",  boost::bind(&LLAvatarActions::shareWithAvatars, this));
-	mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2));
+    mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
+
+    if (!sColorSetInitialized)
+    {
+        sDefaultColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
+        sDefaultHighlightColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+        sLibraryColor = LLUIColorTable::instance().getColor("InventoryItemLibraryColor", DEFAULT_WHITE);
+        sLinkColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
+        sColorSetInitialized = true;
+    }
+
+    // context menu callbacks
+    mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryPanel::doToSelected, this, _2));
+    mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH));
+    mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND));
+    mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLInventoryPanel::doCreate, this, _2));
+    mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&LLInventoryPanel::attachObject, this, _2));
+    mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
+    mCommitCallbackRegistrar.add("Inventory.Share",  boost::bind(&LLAvatarActions::shareWithAvatars, this));
+    mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2));
     mCommitCallbackRegistrar.add("Inventory.OpenNewFolderWindow", boost::bind(&LLInventoryPanel::openSingleViewInventory, this, LLUUID()));
 }
 
@@ -198,15 +198,15 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
     p.rect = LLRect(0, 0, getRect().getWidth(), 0);
     p.parent_panel = this;
     p.tool_tip = p.name;
-    p.listener = mInvFVBridgeBuilder->createBridge(	LLAssetType::AT_CATEGORY,
-																	LLAssetType::AT_CATEGORY,
-																	LLInventoryType::IT_CATEGORY,
-																	this,
-																	&mInventoryViewModel,
-																	NULL,
-																	root_id);
+    p.listener = mInvFVBridgeBuilder->createBridge( LLAssetType::AT_CATEGORY,
+                                                                    LLAssetType::AT_CATEGORY,
+                                                                    LLInventoryType::IT_CATEGORY,
+                                                                    this,
+                                                                    &mInventoryViewModel,
+                                                                    NULL,
+                                                                    root_id);
     p.view_model = &mInventoryViewModel;
-	p.grouped_item_model = mGroupedItemBridge;
+    p.grouped_item_model = mGroupedItemBridge;
     p.use_label_suffix = mParams.use_label_suffix;
     p.allow_multiselect = mAllowMultiSelect;
     p.allow_drag = mAllowDrag;
@@ -217,18 +217,18 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
     p.allow_drop = mParams.allow_drop_on_root;
     p.options_menu = "menu_inventory.xml";
 
-	LLFolderView* fv = LLUICtrlFactory::create<LLFolderView>(p);
-	fv->setCallbackRegistrar(&mCommitCallbackRegistrar);
-	fv->setEnableRegistrar(&mEnableCallbackRegistrar);
+    LLFolderView* fv = LLUICtrlFactory::create<LLFolderView>(p);
+    fv->setCallbackRegistrar(&mCommitCallbackRegistrar);
+    fv->setEnableRegistrar(&mEnableCallbackRegistrar);
 
-	return fv;
+    return fv;
 }
 
 void LLInventoryPanel::clearFolderRoot()
 {
-	gIdleCallbacks.deleteFunction(idle, this);
+    gIdleCallbacks.deleteFunction(idle, this);
     gIdleCallbacks.deleteFunction(onIdle, this);
-    
+
     if (mInventoryObserver)
     {
         mInventory->removeObserver(mInventoryObserver);
@@ -241,7 +241,7 @@ void LLInventoryPanel::clearFolderRoot()
         delete mCompletionObserver;
         mCompletionObserver = NULL;
     }
-    
+
     if (mScroller)
     {
         removeChild(mScroller);
@@ -252,23 +252,23 @@ void LLInventoryPanel::clearFolderRoot()
 
 void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 {
-	// save off copy of params
-	mParams = params;
+    // save off copy of params
+    mParams = params;
 
     initFolderRoot();
 
-	// Initialize base class params.
-	LLPanel::initFromParams(mParams);
+    // Initialize base class params.
+    LLPanel::initFromParams(mParams);
 }
 
 LLInventoryPanel::~LLInventoryPanel()
 {
-	U32 sort_order = getFolderViewModel()->getSorter().getSortOrder();
+    U32 sort_order = getFolderViewModel()->getSorter().getSortOrder();
     if (mSortOrderSetting != INHERIT_SORT_ORDER)
     {
         gSavedSettings.setU32(mSortOrderSetting, sort_order);
     }
-    
+
     clearFolderRoot();
 }
 
@@ -290,13 +290,13 @@ void LLInventoryPanel::initFolderRoot()
         LLFolderView* folder_view = createFolderRoot(root_id);
         mFolderRoot = folder_view->getHandle();
         mRootInited = true;
-    
+
         addItemID(root_id, mFolderRoot.get());
     }
     mCommitCallbackRegistrar.popScope();
     mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
     mFolderRoot.get()->setEnableRegistrar(&mEnableCallbackRegistrar);
-    
+
     // Scroller
     LLRect scroller_view_rect = getRect();
     scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
@@ -345,13 +345,13 @@ void LLInventoryPanel::initFolderRoot()
     {
         getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS));
     }
-    
+
     // set the filter for the empty folder if the debug setting is on
     if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
     {
         getFilter().setFilterEmptySystemFolders();
     }
-    
+
     // keep track of the clipboard state so that we avoid filtering too much
     mClipboardState = LLClipboard::instance().getGeneration();
 }
@@ -394,30 +394,30 @@ void LLInventoryPanel::onVisibilityChange(BOOL new_visibility)
 
 void LLInventoryPanel::draw()
 {
-	// Select the desired item (in case it wasn't loaded when the selection was requested)
-	updateSelection();
-	
-	LLPanel::draw();
+    // Select the desired item (in case it wasn't loaded when the selection was requested)
+    updateSelection();
+
+    LLPanel::draw();
 }
 
 const LLInventoryFilter& LLInventoryPanel::getFilter() const
 {
-	return getFolderViewModel()->getFilter();
+    return getFolderViewModel()->getFilter();
 }
 
 LLInventoryFilter& LLInventoryPanel::getFilter()
 {
-	return getFolderViewModel()->getFilter();
+    return getFolderViewModel()->getFilter();
 }
 
 void LLInventoryPanel::setFilterTypes(U64 types, LLInventoryFilter::EFilterType filter_type)
 {
-	if (filter_type == LLInventoryFilter::FILTERTYPE_OBJECT)
-	{
-		getFilter().setFilterObjectTypes(types);
-	}
-	if (filter_type == LLInventoryFilter::FILTERTYPE_CATEGORY)
-		getFilter().setFilterCategoryTypes(types);
+    if (filter_type == LLInventoryFilter::FILTERTYPE_OBJECT)
+    {
+        getFilter().setFilterObjectTypes(types);
+    }
+    if (filter_type == LLInventoryFilter::FILTERTYPE_CATEGORY)
+        getFilter().setFilterCategoryTypes(types);
 }
 
 void LLInventoryPanel::setFilterWorn()
@@ -425,25 +425,25 @@ void LLInventoryPanel::setFilterWorn()
     getFilter().setFilterWorn();
 }
 
-U32 LLInventoryPanel::getFilterObjectTypes() const 
-{ 
-	return getFilter().getFilterObjectTypes();
+U32 LLInventoryPanel::getFilterObjectTypes() const
+{
+    return getFilter().getFilterObjectTypes();
 }
 
-U32 LLInventoryPanel::getFilterPermMask() const 
-{ 
-	return getFilter().getFilterPermissions();
+U32 LLInventoryPanel::getFilterPermMask() const
+{
+    return getFilter().getFilterPermissions();
 }
 
 
 void LLInventoryPanel::setFilterPermMask(PermissionMask filter_perm_mask)
 {
-	getFilter().setFilterPermissions(filter_perm_mask);
+    getFilter().setFilterPermissions(filter_perm_mask);
 }
 
 void LLInventoryPanel::setFilterWearableTypes(U64 types)
 {
-	getFilter().setFilterWearableTypes(types);
+    getFilter().setFilterWearableTypes(types);
 }
 
 void LLInventoryPanel::setFilterSettingsTypes(U64 filter)
@@ -453,87 +453,87 @@ void LLInventoryPanel::setFilterSettingsTypes(U64 filter)
 
 void LLInventoryPanel::setFilterSubString(const std::string& string)
 {
-	getFilter().setFilterSubString(string);
+    getFilter().setFilterSubString(string);
 }
 
-const std::string LLInventoryPanel::getFilterSubString() 
-{ 
-	return getFilter().getFilterSubString();
+const std::string LLInventoryPanel::getFilterSubString()
+{
+    return getFilter().getFilterSubString();
 }
 
 void LLInventoryPanel::setSortOrder(U32 order)
 {
     LLInventorySort sorter(order);
-	if (order != getFolderViewModel()->getSorter().getSortOrder())
-	{
-		getFolderViewModel()->setSorter(sorter);
-		mFolderRoot.get()->arrangeAll();
-		// try to keep selection onscreen, even if it wasn't to start with
-		mFolderRoot.get()->scrollToShowSelection();
-	}
+    if (order != getFolderViewModel()->getSorter().getSortOrder())
+    {
+        getFolderViewModel()->setSorter(sorter);
+        mFolderRoot.get()->arrangeAll();
+        // try to keep selection onscreen, even if it wasn't to start with
+        mFolderRoot.get()->scrollToShowSelection();
+    }
 }
 
-U32 LLInventoryPanel::getSortOrder() const 
-{ 
-	return getFolderViewModel()->getSorter().getSortOrder();
+U32 LLInventoryPanel::getSortOrder() const
+{
+    return getFolderViewModel()->getSorter().getSortOrder();
 }
 
 void LLInventoryPanel::setSinceLogoff(BOOL sl)
 {
-	getFilter().setDateRangeLastLogoff(sl);
+    getFilter().setDateRangeLastLogoff(sl);
 }
 
 void LLInventoryPanel::setHoursAgo(U32 hours)
 {
-	getFilter().setHoursAgo(hours);
+    getFilter().setHoursAgo(hours);
 }
 
 void LLInventoryPanel::setDateSearchDirection(U32 direction)
 {
-	getFilter().setDateSearchDirection(direction);
+    getFilter().setDateSearchDirection(direction);
 }
 
 void LLInventoryPanel::setFilterLinks(U64 filter_links)
 {
-	getFilter().setFilterLinks(filter_links);
+    getFilter().setFilterLinks(filter_links);
 }
 
 void LLInventoryPanel::setSearchType(LLInventoryFilter::ESearchType type)
 {
-	getFilter().setSearchType(type);
+    getFilter().setSearchType(type);
 }
 
 LLInventoryFilter::ESearchType LLInventoryPanel::getSearchType()
 {
-	return getFilter().getSearchType();
+    return getFilter().getSearchType();
 }
 
 void LLInventoryPanel::setShowFolderState(LLInventoryFilter::EFolderShow show)
 {
-	getFilter().setShowFolderState(show);
+    getFilter().setShowFolderState(show);
 }
 
 LLInventoryFilter::EFolderShow LLInventoryPanel::getShowFolderState()
 {
-	return getFilter().getShowFolderState();
+    return getFilter().getShowFolderState();
 }
 
 void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item)
 {
-	LLFolderViewItem* view_item = getItemByID(item_id);
-	LLFolderViewModelItemInventory* viewmodel_item = 
-		static_cast<LLFolderViewModelItemInventory*>(view_item ? view_item->getViewModelItem() : NULL);
+    LLFolderViewItem* view_item = getItemByID(item_id);
+    LLFolderViewModelItemInventory* viewmodel_item =
+        static_cast<LLFolderViewModelItemInventory*>(view_item ? view_item->getViewModelItem() : NULL);
 
-	// LLFolderViewFolder is derived from LLFolderViewItem so dynamic_cast from item
-	// to folder is the fast way to get a folder without searching through folders tree.
-	LLFolderViewFolder* view_folder = NULL;
+    // LLFolderViewFolder is derived from LLFolderViewItem so dynamic_cast from item
+    // to folder is the fast way to get a folder without searching through folders tree.
+    LLFolderViewFolder* view_folder = NULL;
 
-	// Check requires as this item might have already been deleted
-	// as a child of its deleted parent.
-	if (model_item && view_item)
-	{
-		view_folder = dynamic_cast<LLFolderViewFolder*>(view_item);
-	}
+    // Check requires as this item might have already been deleted
+    // as a child of its deleted parent.
+    if (model_item && view_item)
+    {
+        view_folder = dynamic_cast<LLFolderViewFolder*>(view_item);
+    }
 
     // if folder is not fully initialized (likely due to delayed load on idle)
     // and we are not rebuilding, try updating children
@@ -548,41 +548,41 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
         }
     }
 
-	//////////////////////////////
-	// LABEL Operation
-	// Empty out the display name for relabel.
-	if (mask & LLInventoryObserver::LABEL)
-	{
-		if (view_item)
-		{
-			// Request refresh on this item (also flags for filtering)
-			LLInvFVBridge* bridge = (LLInvFVBridge*)view_item->getViewModelItem();
-			if(bridge)
-			{
-				// Clear the display name first, so it gets properly re-built during refresh()
-				bridge->clearDisplayName();
-
-				view_item->refresh();
-			}
-			LLFolderViewFolder* parent = view_item->getParentFolder();
-			if(parent)
-			{
-				parent->getViewModelItem()->dirtyDescendantsFilter();
-			}
-		}
-	}
-
-	//////////////////////////////
-	// REBUILD Operation
-	// Destroy and regenerate the UI.
-	if (mask & LLInventoryObserver::REBUILD)
-	{
-		if (model_item && view_item && viewmodel_item)
-		{
-			const LLUUID& idp = viewmodel_item->getUUID();
-			view_item->destroyView();
-			removeItemID(idp);
-		}
+    //////////////////////////////
+    // LABEL Operation
+    // Empty out the display name for relabel.
+    if (mask & LLInventoryObserver::LABEL)
+    {
+        if (view_item)
+        {
+            // Request refresh on this item (also flags for filtering)
+            LLInvFVBridge* bridge = (LLInvFVBridge*)view_item->getViewModelItem();
+            if(bridge)
+            {
+                // Clear the display name first, so it gets properly re-built during refresh()
+                bridge->clearDisplayName();
+
+                view_item->refresh();
+            }
+            LLFolderViewFolder* parent = view_item->getParentFolder();
+            if(parent)
+            {
+                parent->getViewModelItem()->dirtyDescendantsFilter();
+            }
+        }
+    }
+
+    //////////////////////////////
+    // REBUILD Operation
+    // Destroy and regenerate the UI.
+    if (mask & LLInventoryObserver::REBUILD)
+    {
+        if (model_item && view_item && viewmodel_item)
+        {
+            const LLUUID& idp = viewmodel_item->getUUID();
+            view_item->destroyView();
+            removeItemID(idp);
+        }
 
         LLInventoryObject const* objectp = mInventory->getObject(item_id);
         if (objectp)
@@ -595,32 +595,32 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
             view_item = NULL;
         }
 
-		viewmodel_item = 
-			static_cast<LLFolderViewModelItemInventory*>(view_item ? view_item->getViewModelItem() : NULL);
-		view_folder = dynamic_cast<LLFolderViewFolder *>(view_item);
-	}
-
-	//////////////////////////////
-	// INTERNAL Operation
-	// This could be anything.  For now, just refresh the item.
-	if (mask & LLInventoryObserver::INTERNAL)
-	{
-		if (view_item)
-		{
-			view_item->refresh();
-		}
-	}
-
-	//////////////////////////////
-	// SORT Operation
-	// Sort the folder.
-	if (mask & LLInventoryObserver::SORT)
-	{
-		if (view_folder)
-		{
-			view_folder->getViewModelItem()->requestSort();
-		}
-	}
+        viewmodel_item =
+            static_cast<LLFolderViewModelItemInventory*>(view_item ? view_item->getViewModelItem() : NULL);
+        view_folder = dynamic_cast<LLFolderViewFolder *>(view_item);
+    }
+
+    //////////////////////////////
+    // INTERNAL Operation
+    // This could be anything.  For now, just refresh the item.
+    if (mask & LLInventoryObserver::INTERNAL)
+    {
+        if (view_item)
+        {
+            view_item->refresh();
+        }
+    }
+
+    //////////////////////////////
+    // SORT Operation
+    // Sort the folder.
+    if (mask & LLInventoryObserver::SORT)
+    {
+        if (view_folder)
+        {
+            view_folder->getViewModelItem()->requestSort();
+        }
+    }
 
     if (mask & LLInventoryObserver::UPDATE_FAVORITE)
     {
@@ -635,21 +635,21 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
         }
     }
 
-	// We don't typically care which of these masks the item is actually flagged with, since the masks
-	// may not be accurate (e.g. in the main inventory panel, I move an item from My Inventory into
-	// Landmarks; this is a STRUCTURE change for that panel but is an ADD change for the Landmarks
-	// panel).  What's relevant is that the item and UI are probably out of sync and thus need to be
-	// resynchronized.
-	if (mask & (LLInventoryObserver::STRUCTURE |
-				LLInventoryObserver::ADD |
-				LLInventoryObserver::REMOVE))
-	{
-		//////////////////////////////
-		// ADD Operation
-		// Item exists in memory but a UI element hasn't been created for it.
-		if (model_item && !view_item)
-		{
-			// Add the UI element for this item.
+    // We don't typically care which of these masks the item is actually flagged with, since the masks
+    // may not be accurate (e.g. in the main inventory panel, I move an item from My Inventory into
+    // Landmarks; this is a STRUCTURE change for that panel but is an ADD change for the Landmarks
+    // panel).  What's relevant is that the item and UI are probably out of sync and thus need to be
+    // resynchronized.
+    if (mask & (LLInventoryObserver::STRUCTURE |
+                LLInventoryObserver::ADD |
+                LLInventoryObserver::REMOVE))
+    {
+        //////////////////////////////
+        // ADD Operation
+        // Item exists in memory but a UI element hasn't been created for it.
+        if (model_item && !view_item)
+        {
+            // Add the UI element for this item.
             LLInventoryObject const* objectp = mInventory->getObject(item_id);
             if (objectp)
             {
@@ -657,12 +657,12 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                 buildNewViews(item_id, objectp, NULL, BUILD_ONE_FOLDER);
             }
 
-			// Select any newly created object that has the auto rename at top of folder root set.
-			if(mFolderRoot.get()->getRoot()->needsAutoRename())
-			{
-				setSelection(item_id, FALSE);
-			}
-			updateFolderLabel(model_item->getParentUUID());
+            // Select any newly created object that has the auto rename at top of folder root set.
+            if(mFolderRoot.get()->getRoot()->needsAutoRename())
+            {
+                setSelection(item_id, FALSE);
+            }
+            updateFolderLabel(model_item->getParentUUID());
 
             if (get_is_favorite(model_item))
             {
@@ -673,86 +673,86 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                 }
             }
 
-		}
-
-		//////////////////////////////
-		// STRUCTURE Operation
-		// This item already exists in both memory and UI.  It was probably reparented.
-		else if (model_item && view_item)
-		{
-			LLFolderViewFolder* old_parent = view_item->getParentFolder();
-			// Don't process the item if it is the root
-			if (old_parent)
-			{
-				LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(old_parent->getViewModelItem());
-				LLFolderViewFolder* new_parent =   (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
-				// Item has been moved.
-				if (old_parent != new_parent)
-				{
-					if (new_parent != NULL)
-					{
-						// Item is to be moved and we found its new parent in the panel's directory, so move the item's UI.
-						view_item->addToFolder(new_parent);
-						addItemID(viewmodel_item->getUUID(), view_item);
-						if (mInventory)
-						{
-							const LLUUID trash_id = mInventory->findCategoryUUIDForType(LLFolderType::FT_TRASH);
-							if (trash_id != model_item->getParentUUID() && (mask & LLInventoryObserver::INTERNAL) && new_parent->isOpen())
-							{
-								setSelection(item_id, FALSE);
-							}
-						}
-						updateFolderLabel(model_item->getParentUUID());
-					}
-					else 
-					{
-						// Remove the item ID before destroying the view because the view-model-item gets
-						// destroyed when the view is destroyed
-						removeItemID(viewmodel_item->getUUID());
-
-						// Item is to be moved outside the panel's directory (e.g. moved to trash for a panel that 
-						// doesn't include trash).  Just remove the item's UI.
-						view_item->destroyView();
-					}
-					if(viewmodel_folder)
-					{
-						updateFolderLabel(viewmodel_folder->getUUID());
-					}
-					old_parent->getViewModelItem()->dirtyDescendantsFilter();
+        }
+
+        //////////////////////////////
+        // STRUCTURE Operation
+        // This item already exists in both memory and UI.  It was probably reparented.
+        else if (model_item && view_item)
+        {
+            LLFolderViewFolder* old_parent = view_item->getParentFolder();
+            // Don't process the item if it is the root
+            if (old_parent)
+            {
+                LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(old_parent->getViewModelItem());
+                LLFolderViewFolder* new_parent =   (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
+                // Item has been moved.
+                if (old_parent != new_parent)
+                {
+                    if (new_parent != NULL)
+                    {
+                        // Item is to be moved and we found its new parent in the panel's directory, so move the item's UI.
+                        view_item->addToFolder(new_parent);
+                        addItemID(viewmodel_item->getUUID(), view_item);
+                        if (mInventory)
+                        {
+                            const LLUUID trash_id = mInventory->findCategoryUUIDForType(LLFolderType::FT_TRASH);
+                            if (trash_id != model_item->getParentUUID() && (mask & LLInventoryObserver::INTERNAL) && new_parent->isOpen())
+                            {
+                                setSelection(item_id, FALSE);
+                            }
+                        }
+                        updateFolderLabel(model_item->getParentUUID());
+                    }
+                    else
+                    {
+                        // Remove the item ID before destroying the view because the view-model-item gets
+                        // destroyed when the view is destroyed
+                        removeItemID(viewmodel_item->getUUID());
+
+                        // Item is to be moved outside the panel's directory (e.g. moved to trash for a panel that
+                        // doesn't include trash).  Just remove the item's UI.
+                        view_item->destroyView();
+                    }
+                    if(viewmodel_folder)
+                    {
+                        updateFolderLabel(viewmodel_folder->getUUID());
+                    }
+                    old_parent->getViewModelItem()->dirtyDescendantsFilter();
 
                     if (view_item->isFavorite())
                     {
                         old_parent->updateHasFavorites(false); // favorite was removed
                         new_parent->updateHasFavorites(true); // favorite was added
                     }
-				}
-			}
-		}
-
-		//////////////////////////////
-		// REMOVE Operation
-		// This item has been removed from memory, but its associated UI element still exists.
-		else if (!model_item && view_item && viewmodel_item)
-		{
-			// Remove the item's UI.
-			LLFolderViewFolder* parent = view_item->getParentFolder();
-			removeItemID(viewmodel_item->getUUID());
-			view_item->destroyView();
-			if(parent)
-			{
-				parent->getViewModelItem()->dirtyDescendantsFilter();
-				LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(parent->getViewModelItem());
-				if(viewmodel_folder)
-				{
-					updateFolderLabel(viewmodel_folder->getUUID());
-				}
+                }
+            }
+        }
+
+        //////////////////////////////
+        // REMOVE Operation
+        // This item has been removed from memory, but its associated UI element still exists.
+        else if (!model_item && view_item && viewmodel_item)
+        {
+            // Remove the item's UI.
+            LLFolderViewFolder* parent = view_item->getParentFolder();
+            removeItemID(viewmodel_item->getUUID());
+            view_item->destroyView();
+            if(parent)
+            {
+                parent->getViewModelItem()->dirtyDescendantsFilter();
+                LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(parent->getViewModelItem());
+                if(viewmodel_folder)
+                {
+                    updateFolderLabel(viewmodel_folder->getUUID());
+                }
                 if (view_item->isFavorite())
                 {
                     parent->updateHasFavorites(false); // favorite was removed
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 // Called when something changed in the global model (new item, item coming through the wire, rename, move, etc...) (CHUI-849)
@@ -760,110 +760,110 @@ void LLInventoryPanel::modelChanged(U32 mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 
-	if (mViewsInitialized != VIEWS_INITIALIZED) return;
-	
-	const LLInventoryModel* model = getModel();
-	if (!model) return;
+    if (mViewsInitialized != VIEWS_INITIALIZED) return;
 
-	const LLInventoryModel::changed_items_t& changed_items = model->getChangedIDs();
-	if (changed_items.empty()) return;
+    const LLInventoryModel* model = getModel();
+    if (!model) return;
 
-	for (LLInventoryModel::changed_items_t::const_iterator items_iter = changed_items.begin();
-		 items_iter != changed_items.end();
-		 ++items_iter)
-	{
-		const LLUUID& item_id = (*items_iter);
-		const LLInventoryObject* model_item = model->getObject(item_id);
-		itemChanged(item_id, mask, model_item);
-	}
+    const LLInventoryModel::changed_items_t& changed_items = model->getChangedIDs();
+    if (changed_items.empty()) return;
+
+    for (LLInventoryModel::changed_items_t::const_iterator items_iter = changed_items.begin();
+         items_iter != changed_items.end();
+         ++items_iter)
+    {
+        const LLUUID& item_id = (*items_iter);
+        const LLInventoryObject* model_item = model->getObject(item_id);
+        itemChanged(item_id, mask, model_item);
+    }
 }
 
 LLUUID LLInventoryPanel::getRootFolderID()
 {
     LLUUID root_id;
-	if (mFolderRoot.get() && mFolderRoot.get()->getViewModelItem())
-	{
-		root_id = static_cast<LLFolderViewModelItemInventory*>(mFolderRoot.get()->getViewModelItem())->getUUID();
-	}
-	else
-	{
-		if (mParams.start_folder.id.isChosen())
-		{
-			root_id = mParams.start_folder.id;
-		}
-		else
-		{
-			const LLFolderType::EType preferred_type = mParams.start_folder.type.isChosen() 
-				? mParams.start_folder.type
-				: LLViewerFolderType::lookupTypeFromNewCategoryName(mParams.start_folder.name);
-
-			if ("LIBRARY" == mParams.start_folder.name())
-			{
-				root_id = gInventory.getLibraryRootFolderID();
-			}
-			else if (preferred_type != LLFolderType::FT_NONE)
-			{
+    if (mFolderRoot.get() && mFolderRoot.get()->getViewModelItem())
+    {
+        root_id = static_cast<LLFolderViewModelItemInventory*>(mFolderRoot.get()->getViewModelItem())->getUUID();
+    }
+    else
+    {
+        if (mParams.start_folder.id.isChosen())
+        {
+            root_id = mParams.start_folder.id;
+        }
+        else
+        {
+            const LLFolderType::EType preferred_type = mParams.start_folder.type.isChosen()
+                ? mParams.start_folder.type
+                : LLViewerFolderType::lookupTypeFromNewCategoryName(mParams.start_folder.name);
+
+            if ("LIBRARY" == mParams.start_folder.name())
+            {
+                root_id = gInventory.getLibraryRootFolderID();
+            }
+            else if (preferred_type != LLFolderType::FT_NONE)
+            {
                 LLStringExplicit label(mParams.start_folder.name());
                 setLabel(label);
-                
-				root_id = gInventory.findCategoryUUIDForType(preferred_type);
-				if (root_id.isNull())
-				{
-					LL_WARNS() << "Could not find folder of type " << preferred_type << LL_ENDL;
-					root_id.generateNewID();
-				}
-			}
-		}
-	}
+
+                root_id = gInventory.findCategoryUUIDForType(preferred_type);
+                if (root_id.isNull())
+                {
+                    LL_WARNS() << "Could not find folder of type " << preferred_type << LL_ENDL;
+                    root_id.generateNewID();
+                }
+            }
+        }
+    }
     return root_id;
 }
 
 // static
 void LLInventoryPanel::onIdle(void *userdata)
 {
-	if (!gInventory.isInventoryUsable())
-		return;
+    if (!gInventory.isInventoryUsable())
+        return;
 
-	LLInventoryPanel *self = (LLInventoryPanel*)userdata;
-	if (self->mViewsInitialized <= VIEWS_INITIALIZING)
-	{
-		const F64 max_time = 0.001f; // 1 ms, in this case we need only root folders
-		self->initializeViews(max_time); // Shedules LLInventoryPanel::idle()
-	}
-	if (self->mViewsInitialized >= VIEWS_BUILDING)
-	{
-		gIdleCallbacks.deleteFunction(onIdle, (void*)self);
-	}
+    LLInventoryPanel *self = (LLInventoryPanel*)userdata;
+    if (self->mViewsInitialized <= VIEWS_INITIALIZING)
+    {
+        const F64 max_time = 0.001f; // 1 ms, in this case we need only root folders
+        self->initializeViews(max_time); // Shedules LLInventoryPanel::idle()
+    }
+    if (self->mViewsInitialized >= VIEWS_BUILDING)
+    {
+        gIdleCallbacks.deleteFunction(onIdle, (void*)self);
+    }
 }
 
 struct DirtyFilterFunctor : public LLFolderViewFunctor
 {
-	/*virtual*/ void doFolder(LLFolderViewFolder* folder)
-	{
-		folder->getViewModelItem()->dirtyFilter();
-	}
-	/*virtual*/ void doItem(LLFolderViewItem* item)
-	{
-		item->getViewModelItem()->dirtyFilter();
-	}
+    /*virtual*/ void doFolder(LLFolderViewFolder* folder)
+    {
+        folder->getViewModelItem()->dirtyFilter();
+    }
+    /*virtual*/ void doItem(LLFolderViewItem* item)
+    {
+        item->getViewModelItem()->dirtyFilter();
+    }
 };
 
 void LLInventoryPanel::idle(void* user_data)
 {
-	LLInventoryPanel* panel = (LLInventoryPanel*)user_data;
-	// Nudge the filter if the clipboard state changed
-	if (panel->mClipboardState != LLClipboard::instance().getGeneration())
-	{
-		panel->mClipboardState = LLClipboard::instance().getGeneration();
-		const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-		LLFolderViewFolder* trash_folder = panel->getFolderByID(trash_id);
-		if (trash_folder)
-		{
+    LLInventoryPanel* panel = (LLInventoryPanel*)user_data;
+    // Nudge the filter if the clipboard state changed
+    if (panel->mClipboardState != LLClipboard::instance().getGeneration())
+    {
+        panel->mClipboardState = LLClipboard::instance().getGeneration();
+        const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+        LLFolderViewFolder* trash_folder = panel->getFolderByID(trash_id);
+        if (trash_folder)
+        {
             DirtyFilterFunctor dirtyFilterFunctor;
-			trash_folder->applyFunctorToChildren(dirtyFilterFunctor);
-		}
+            trash_folder->applyFunctorToChildren(dirtyFilterFunctor);
+        }
 
-	}
+    }
 
     bool in_visible_chain = panel->isInVisibleChain();
 
@@ -956,7 +956,7 @@ void LLInventoryPanel::idle(void* user_data)
 
 void LLInventoryPanel::initializeViews(F64 max_time)
 {
-	if (!gInventory.isInventoryUsable()) return;
+    if (!gInventory.isInventoryUsable()) return;
     if (!mRootInited) return;
 
     mViewsInitialized = VIEWS_BUILDING;
@@ -964,7 +964,7 @@ void LLInventoryPanel::initializeViews(F64 max_time)
     F64 curent_time = LLTimer::getTotalSeconds();
     mBuildViewsEndTime = curent_time + max_time;
 
-	// init everything
+    // init everything
     initRootContent();
 
     if (mBuildViewsQueue.empty() && mBuildRootQueue.empty())
@@ -972,30 +972,30 @@ void LLInventoryPanel::initializeViews(F64 max_time)
         mViewsInitialized = VIEWS_INITIALIZED;
     }
 
-	gIdleCallbacks.addFunction(idle, this);
-	
+    gIdleCallbacks.addFunction(idle, this);
+
     if(mParams.open_first_folder)
     {
         openStartFolderOrMyInventory();
     }
-	
-	// Special case for new user login
-	if (gAgent.isFirstLogin())
-	{
-		// Auto open the user's library
-		LLFolderViewFolder* lib_folder =   getFolderByID(gInventory.getLibraryRootFolderID());
-		if (lib_folder)
-		{
-			lib_folder->setOpen(TRUE);
-		}
-		
-		// Auto close the user's my inventory folder
-		LLFolderViewFolder* my_inv_folder =   getFolderByID(gInventory.getRootFolderID());
-		if (my_inv_folder)
-		{
-			my_inv_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
-		}
-	}
+
+    // Special case for new user login
+    if (gAgent.isFirstLogin())
+    {
+        // Auto open the user's library
+        LLFolderViewFolder* lib_folder =   getFolderByID(gInventory.getLibraryRootFolderID());
+        if (lib_folder)
+        {
+            lib_folder->setOpen(TRUE);
+        }
+
+        // Auto close the user's my inventory folder
+        LLFolderViewFolder* my_inv_folder =   getFolderByID(gInventory.getRootFolderID());
+        if (my_inv_folder)
+        {
+            my_inv_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
+        }
+    }
 }
 
 void LLInventoryPanel::initRootContent()
@@ -1009,43 +1009,43 @@ void LLInventoryPanel::initRootContent()
     {
         // Default case: always add "My Inventory" root first, "Library" root second
         // If we run out of time, this still should create root folders
-        buildNewViews(gInventory.getRootFolderID());		// My Inventory
-        buildNewViews(gInventory.getLibraryRootFolderID());	// Library
+        buildNewViews(gInventory.getRootFolderID());        // My Inventory
+        buildNewViews(gInventory.getLibraryRootFolderID()); // Library
     }
 }
 
 
 LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop)
 {
-	LLFolderViewFolder::Params params(mParams.folder);
+    LLFolderViewFolder::Params params(mParams.folder);
 
-	params.name = bridge->getDisplayName();
-	params.root = mFolderRoot.get();
-	params.listener = bridge;
-	params.tool_tip = params.name;
+    params.name = bridge->getDisplayName();
+    params.root = mFolderRoot.get();
+    params.listener = bridge;
+    params.tool_tip = params.name;
     params.allow_drop = allow_drop;
 
-	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
-	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
-	
-	return LLUICtrlFactory::create<LLFolderViewFolder>(params);
+    params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
+    params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
+
+    return LLUICtrlFactory::create<LLFolderViewFolder>(params);
 }
 
 LLFolderViewItem * LLInventoryPanel::createFolderViewItem(LLInvFVBridge * bridge)
 {
-	LLFolderViewItem::Params params(mParams.item);
-	
-	params.name = bridge->getDisplayName();
-	params.creation_date = bridge->getCreationDate();
-	params.root = mFolderRoot.get();
-	params.listener = bridge;
-	params.rect = LLRect (0, 0, 0, 0);
-	params.tool_tip = params.name;
+    LLFolderViewItem::Params params(mParams.item);
+
+    params.name = bridge->getDisplayName();
+    params.creation_date = bridge->getCreationDate();
+    params.root = mFolderRoot.get();
+    params.listener = bridge;
+    params.rect = LLRect (0, 0, 0, 0);
+    params.tool_tip = params.name;
 
-	params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
-	params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
-	
-	return LLUICtrlFactory::create<LLFolderViewItem>(params);
+    params.font_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultColor);
+    params.font_highlight_color = (bridge->isLibraryItem() ? sLibraryColor : sDefaultHighlightColor);
+
+    return LLUICtrlFactory::create<LLFolderViewItem>(params);
 }
 
 LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id)
@@ -1120,88 +1120,88 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
         }
     }
 
- 	if (!folder_view_item && parent_folder)
-  		{
-			if (objectp->getType() <= LLAssetType::AT_NONE)
-			{
-				LL_WARNS() << "LLInventoryPanel::buildViewsTree called with invalid objectp->mType : "
-					<< ((S32)objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
-					<< LL_ENDL;
-				return NULL;
-			}
-			
-			if (objectp->getType() >= LLAssetType::AT_COUNT)
-  			{
-				// Example: Happens when we add assets of new, not yet supported type to library
-				LL_DEBUGS("Inventory") << "LLInventoryPanel::buildViewsTree called with unknown objectp->mType : "
-				<< ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
-				<< LL_ENDL;
-
-				LLInventoryItem* item = (LLInventoryItem*)objectp;
-				if (item)
-				{
-					LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(LLAssetType::AT_UNKNOWN,
-						LLAssetType::AT_UNKNOWN,
-						LLInventoryType::IT_UNKNOWN,
-						this,
-						&mInventoryViewModel,
-						mFolderRoot.get(),
-						item->getUUID(),
-						item->getFlags());
-
-					if (new_listener)
-					{
-						folder_view_item = createFolderViewItem(new_listener);
-					}
-				}
-  			}
-  		
-  			if ((objectp->getType() == LLAssetType::AT_CATEGORY) &&
-  				(objectp->getActualType() != LLAssetType::AT_LINK_FOLDER))
-  			{
-  				LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(LLAssetType::AT_CATEGORY,
+    if (!folder_view_item && parent_folder)
+        {
+            if (objectp->getType() <= LLAssetType::AT_NONE)
+            {
+                LL_WARNS() << "LLInventoryPanel::buildViewsTree called with invalid objectp->mType : "
+                    << ((S32)objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
+                    << LL_ENDL;
+                return NULL;
+            }
+
+            if (objectp->getType() >= LLAssetType::AT_COUNT)
+            {
+                // Example: Happens when we add assets of new, not yet supported type to library
+                LL_DEBUGS("Inventory") << "LLInventoryPanel::buildViewsTree called with unknown objectp->mType : "
+                << ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
+                << LL_ENDL;
+
+                LLInventoryItem* item = (LLInventoryItem*)objectp;
+                if (item)
+                {
+                    LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(LLAssetType::AT_UNKNOWN,
+                        LLAssetType::AT_UNKNOWN,
+                        LLInventoryType::IT_UNKNOWN,
+                        this,
+                        &mInventoryViewModel,
+                        mFolderRoot.get(),
+                        item->getUUID(),
+                        item->getFlags());
+
+                    if (new_listener)
+                    {
+                        folder_view_item = createFolderViewItem(new_listener);
+                    }
+                }
+            }
+
+            if ((objectp->getType() == LLAssetType::AT_CATEGORY) &&
+                (objectp->getActualType() != LLAssetType::AT_LINK_FOLDER))
+            {
+                LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(LLAssetType::AT_CATEGORY,
                                             (mParams.use_marketplace_folders ? LLAssetType::AT_MARKETPLACE_FOLDER : LLAssetType::AT_CATEGORY),
-  																				LLInventoryType::IT_CATEGORY,
-  																				this,
+                                                                                LLInventoryType::IT_CATEGORY,
+                                                                                this,
                                                                                 &mInventoryViewModel,
-  																				mFolderRoot.get(),
-  																				objectp->getUUID());
-  				if (new_listener)
-  				{
+                                                                                mFolderRoot.get(),
+                                                                                objectp->getUUID());
+                if (new_listener)
+                {
                     folder_view_item = createFolderViewFolder(new_listener,allow_drop);
-  				}
-  			}
-  			else
-  			{
-  				// Build new view for item.
-  				LLInventoryItem* item = (LLInventoryItem*)objectp;
-  				LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
-  																				item->getActualType(),
-  																				item->getInventoryType(),
-  																				this,
-																			&mInventoryViewModel,
-  																				mFolderRoot.get(),
-  																				item->getUUID(),
-  																				item->getFlags());
- 
-  				if (new_listener)
-  				{
-				folder_view_item = createFolderViewItem(new_listener);
-  				}
-  			}
- 
-  	    if (folder_view_item)
+                }
+            }
+            else
+            {
+                // Build new view for item.
+                LLInventoryItem* item = (LLInventoryItem*)objectp;
+                LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
+                                                                                item->getActualType(),
+                                                                                item->getInventoryType(),
+                                                                                this,
+                                                                            &mInventoryViewModel,
+                                                                                mFolderRoot.get(),
+                                                                                item->getUUID(),
+                                                                                item->getFlags());
+
+                if (new_listener)
+                {
+                folder_view_item = createFolderViewItem(new_listener);
+                }
+            }
+
+        if (folder_view_item)
         {
             llassert(parent_folder != NULL);
             folder_view_item->addToFolder(parent_folder);
-			addItemID(id, folder_view_item);
+            addItemID(id, folder_view_item);
             // In the case of the root folder been shown, open that folder by default once the widget is created
             if (create_root)
             {
                 folder_view_item->setOpen(TRUE);
             }
         }
-	}
+    }
 
     bool create_children = folder_view_item && objectp->getType() == LLAssetType::AT_CATEGORY
                             && (mBuildChildrenViews || depth == 0);
@@ -1265,13 +1265,13 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
         }
     }
 
-	// If this is a folder, add the children of the folder and recursively add any 
-	// child folders.
-	if (create_children)
-	{
-		LLViewerInventoryCategory::cat_array_t* categories;
-		LLViewerInventoryItem::item_array_t* items;
-		mInventory->lockDirectDescendentArrays(id, categories, items);
+    // If this is a folder, add the children of the folder and recursively add any
+    // child folders.
+    if (create_children)
+    {
+        LLViewerInventoryCategory::cat_array_t* categories;
+        LLViewerInventoryItem::item_array_t* items;
+        mInventory->lockDirectDescendentArrays(id, categories, items);
 
         // Make sure panel won't lock in a loop over existing items if
         // folder is enormous and at least some work gets done
@@ -1281,15 +1281,15 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
         LLFolderViewFolder *parentp = dynamic_cast<LLFolderViewFolder*>(folder_view_item);
         bool done = true;
 
-		if(categories)
+        if(categories)
         {
             bool has_folders = parentp->getFoldersCount() > 0;
-			for (LLViewerInventoryCategory::cat_array_t::const_iterator cat_iter = categories->begin();
-				 cat_iter != categories->end();
-				 ++cat_iter)
-			{
-				const LLViewerInventoryCategory* cat = (*cat_iter);
-                if (typedViewsFilter(cat->getUUID(), cat)) 
+            for (LLViewerInventoryCategory::cat_array_t::const_iterator cat_iter = categories->begin();
+                 cat_iter != categories->end();
+                 ++cat_iter)
+            {
+                const LLViewerInventoryCategory* cat = (*cat_iter);
+                if (typedViewsFilter(cat->getUUID(), cat))
                 {
                     if (has_folders)
                     {
@@ -1310,7 +1310,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     && MIN_ITEMS_PER_CALL + starting_item_count < mItemMap.size())
                 {
                     // Single folder view, check if we still have time
-                    // 
+                    //
                     // Todo: make sure this causes no dupplciates, breaks nothing,
                     // especially filters and arrange
                     F64 curent_time = LLTimer::getTotalSeconds();
@@ -1321,17 +1321,17 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                         break;
                     }
                 }
-			}
-		}
-		
-		if(items)
-        {
-			for (LLViewerInventoryItem::item_array_t::const_iterator item_iter = items->begin();
-				 item_iter != items->end();
-				 ++item_iter)
-			{
+            }
+        }
+
+        if(items)
+        {
+            for (LLViewerInventoryItem::item_array_t::const_iterator item_iter = items->begin();
+                 item_iter != items->end();
+                 ++item_iter)
+            {
                 // At the moment we have to build folder's items in bulk and ignore mBuildViewsEndTime
-				const LLViewerInventoryItem* item = (*item_iter);
+                const LLViewerInventoryItem* item = (*item_iter);
                 if (typedViewsFilter(item->getUUID(), item))
                 {
                     // This can be optimized: we don't need to call getItemByID()
@@ -1346,7 +1346,7 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                     && MIN_ITEMS_PER_CALL + starting_item_count < mItemMap.size())
                 {
                     // Single folder view, check if we still have time
-                    // 
+                    //
                     // Todo: make sure this causes no dupplciates, breaks nothing,
                     // especially filters and arrange
                     F64 curent_time = LLTimer::getTotalSeconds();
@@ -1357,84 +1357,84 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
                         break;
                     }
                 }
-			}
-		}
+            }
+        }
 
         if (!mBuildChildrenViews && done)
         {
             // flat list is done initializing folder
             folder_view_item->setChildrenInited(true);
         }
-		mInventory->unlockDirectDescendentArrays(id);
-	}
-	
-	return folder_view_item;
+        mInventory->unlockDirectDescendentArrays(id);
+    }
+
+    return folder_view_item;
 }
 
 // bit of a hack to make sure the inventory is open.
 void LLInventoryPanel::openStartFolderOrMyInventory()
 {
-	// Find My Inventory folder and open it up by name
-	for (LLView *child = mFolderRoot.get()->getFirstChild(); child; child = mFolderRoot.get()->findNextSibling(child))
-	{
-		LLFolderViewFolder *fchild = dynamic_cast<LLFolderViewFolder*>(child);
-		if (fchild
-			&& fchild->getViewModelItem()
-			&& fchild->getViewModelItem()->getName() == "My Inventory")
-		{
-			fchild->setOpen(TRUE);
-			break;
-		}
-	}
+    // Find My Inventory folder and open it up by name
+    for (LLView *child = mFolderRoot.get()->getFirstChild(); child; child = mFolderRoot.get()->findNextSibling(child))
+    {
+        LLFolderViewFolder *fchild = dynamic_cast<LLFolderViewFolder*>(child);
+        if (fchild
+            && fchild->getViewModelItem()
+            && fchild->getViewModelItem()->getName() == "My Inventory")
+        {
+            fchild->setOpen(TRUE);
+            break;
+        }
+    }
 }
 
 void LLInventoryPanel::onItemsCompletion()
 {
-	if (mFolderRoot.get()) mFolderRoot.get()->updateMenu();
+    if (mFolderRoot.get()) mFolderRoot.get()->updateMenu();
 }
 
 void LLInventoryPanel::openSelected()
 {
-	LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
-	if(!folder_item) return;
-	LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
-	if(!bridge) return;
-	bridge->openItem();
+    LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
+    if(!folder_item) return;
+    LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+    if(!bridge) return;
+    bridge->openItem();
 }
 
-void LLInventoryPanel::unSelectAll()	
-{ 
-	mFolderRoot.get()->setSelection(NULL, FALSE, FALSE);
+void LLInventoryPanel::unSelectAll()
+{
+    mFolderRoot.get()->setSelection(NULL, FALSE, FALSE);
 }
 
 
 BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
 {
-	BOOL handled = LLView::handleHover(x, y, mask);
-	if(handled)
+    BOOL handled = LLView::handleHover(x, y, mask);
+    if(handled)
     {
         // getCursor gets current cursor, setCursor sets next cursor
         // check that children didn't set own 'next' cursor
-		ECursorType cursor = getWindow()->getNextCursor();
-		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW)
-		{
-			// replace arrow cursor with arrow and hourglass cursor
-			getWindow()->setCursor(UI_CURSOR_WORKING);
-		}
-	}
-	else
-	{
-		getWindow()->setCursor(UI_CURSOR_ARROW);
-	}
-	return TRUE;
+        ECursorType cursor = getWindow()->getNextCursor();
+        if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW)
+        {
+            // replace arrow cursor with arrow and hourglass cursor
+            getWindow()->setCursor(UI_CURSOR_WORKING);
+        }
+    }
+    else
+    {
+        getWindow()->setCursor(UI_CURSOR_ARROW);
+    }
+    return TRUE;
 }
 
 BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
 {
-	if (const LLFolderViewItem* hover_item_p = (!mFolderRoot.isDead()) ? mFolderRoot.get()->getHoveredItem() : nullptr)
-	{
-		if (const LLFolderViewModelItemInventory* vm_item_p = static_cast<const LLFolderViewModelItemInventory*>(hover_item_p->getViewModelItem()))
-		{
+    if (const LLFolderViewItem* hover_item_p = (!mFolderRoot.isDead()) ? mFolderRoot.get()->getHoveredItem() : nullptr)
+    {
+        if (const LLFolderViewModelItemInventory* vm_item_p = static_cast<const LLFolderViewModelItemInventory*>(hover_item_p->getViewModelItem()))
+        {
             LLSD params;
             params["inv_type"] = vm_item_p->getInventoryType();
             params["thumbnail_id"] = vm_item_p->getThumbnailUUID();
@@ -1448,64 +1448,64 @@ BOOL LLInventoryPanel::handleToolTip(S32 x, S32 y, MASK mask)
                 actionable_rect.mBottom = actionable_rect.mTop - hover_item_p->getItemHeight();
             }
 
-			LLToolTipMgr::instance().show(LLToolTip::Params()
-					.message(hover_item_p->getToolTip())
-					.sticky_rect(actionable_rect)
-					.delay_time(LLView::getTooltipTimeout())
-					.create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
-					.create_params(params));
-			return TRUE;
-		}
-	}
-	return LLPanel::handleToolTip(x, y, mask);
+            LLToolTipMgr::instance().show(LLToolTip::Params()
+                    .message(hover_item_p->getToolTip())
+                    .sticky_rect(actionable_rect)
+                    .delay_time(LLView::getTooltipTimeout())
+                    .create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
+                    .create_params(params));
+            return TRUE;
+        }
+    }
+    return LLPanel::handleToolTip(x, y, mask);
 }
 
 BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg)
+                                   EDragAndDropType cargo_type,
+                                   void* cargo_data,
+                                   EAcceptance* accept,
+                                   std::string& tooltip_msg)
 {
-	BOOL handled = FALSE;
+    BOOL handled = FALSE;
 
-	if (mAcceptsDragAndDrop)
-	{
-		handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+    if (mAcceptsDragAndDrop)
+    {
+        handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
 
-		// If folder view is empty the (x, y) point won't be in its rect
-		// so the handler must be called explicitly.
-		// but only if was not handled before. See EXT-6746.
-		if (!handled && mParams.allow_drop_on_root && !mFolderRoot.get()->hasVisibleChildren())
-		{
-			handled = mFolderRoot.get()->handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
-		}
+        // If folder view is empty the (x, y) point won't be in its rect
+        // so the handler must be called explicitly.
+        // but only if was not handled before. See EXT-6746.
+        if (!handled && mParams.allow_drop_on_root && !mFolderRoot.get()->hasVisibleChildren())
+        {
+            handled = mFolderRoot.get()->handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+        }
 
-		if (handled)
-		{
-			mFolderRoot.get()->setDragAndDropThisFrame();
-		}
-	}
+        if (handled)
+        {
+            mFolderRoot.get()->setDragAndDropThisFrame();
+        }
+    }
 
-	return handled;
+    return handled;
 }
 
 void LLInventoryPanel::onFocusLost()
 {
-	// inventory no longer handles cut/copy/paste/delete
-	if (LLEditMenuHandler::gEditMenuHandler == mFolderRoot.get())
-	{
-		LLEditMenuHandler::gEditMenuHandler = NULL;
-	}
+    // inventory no longer handles cut/copy/paste/delete
+    if (LLEditMenuHandler::gEditMenuHandler == mFolderRoot.get())
+    {
+        LLEditMenuHandler::gEditMenuHandler = NULL;
+    }
 
-	LLPanel::onFocusLost();
+    LLPanel::onFocusLost();
 }
 
 void LLInventoryPanel::onFocusReceived()
 {
-	// inventory now handles cut/copy/paste/delete
-	LLEditMenuHandler::gEditMenuHandler = mFolderRoot.get();
+    // inventory now handles cut/copy/paste/delete
+    LLEditMenuHandler::gEditMenuHandler = mFolderRoot.get();
 
-	LLPanel::onFocusReceived();
+    LLPanel::onFocusReceived();
 }
 
 void LLInventoryPanel::onFolderOpening(const LLUUID &id)
@@ -1522,46 +1522,46 @@ void LLInventoryPanel::onFolderOpening(const LLUUID &id)
 
 bool LLInventoryPanel::addBadge(LLBadge * badge)
 {
-	bool badge_added = false;
+    bool badge_added = false;
 
-	if (acceptsBadge())
-	{
-		badge_added = badge->addToView(mFolderRoot.get());
-	}
+    if (acceptsBadge())
+    {
+        badge_added = badge->addToView(mFolderRoot.get());
+    }
 
-	return badge_added;
+    return badge_added;
 }
 
 void LLInventoryPanel::openAllFolders()
 {
-	mFolderRoot.get()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
-	mFolderRoot.get()->arrangeAll();
+    mFolderRoot.get()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
+    mFolderRoot.get()->arrangeAll();
 }
 
 void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus)
 {
-	// Don't select objects in COF (e.g. to prevent refocus when items are worn).
-	const LLInventoryObject *obj = mInventory->getObject(obj_id);
-	if (obj && obj->getParentUUID() == LLAppearanceMgr::instance().getCOF())
-	{
-		return;
-	}
-	setSelectionByID(obj_id, take_keyboard_focus);
-}
-
-void LLInventoryPanel::setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb) 
-{ 
-	if (mFolderRoot.get())
-	{
-		mFolderRoot.get()->setSelectCallback(cb);
-	}
+    // Don't select objects in COF (e.g. to prevent refocus when items are worn).
+    const LLInventoryObject *obj = mInventory->getObject(obj_id);
+    if (obj && obj->getParentUUID() == LLAppearanceMgr::instance().getCOF())
+    {
+        return;
+    }
+    setSelectionByID(obj_id, take_keyboard_focus);
+}
+
+void LLInventoryPanel::setSelectCallback(const boost::function<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)>& cb)
+{
+    if (mFolderRoot.get())
+    {
+        mFolderRoot.get()->setSelectCallback(cb);
+    }
     mSelectionCallback = cb;
 }
 
 void LLInventoryPanel::clearSelection()
 {
-	mSelectThisID.setNull();
-	mFocusSelection = false;
+    mSelectThisID.setNull();
+    mFocusSelection = false;
 }
 
 LLInventoryPanel::selected_items_t LLInventoryPanel::getSelectedItems() const
@@ -1571,213 +1571,213 @@ LLInventoryPanel::selected_items_t LLInventoryPanel::getSelectedItems() const
 
 void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
 {
-	// Schedule updating the folder view context menu when all selected items become complete (STORM-373).
-	mCompletionObserver->reset();
-	for (std::deque<LLFolderViewItem*>::const_iterator it = items.begin(); it != items.end(); ++it)
-	{
-		LLFolderViewModelItemInventory* view_model = static_cast<LLFolderViewModelItemInventory*>((*it)->getViewModelItem());
-		if (view_model)
-		{
-			LLUUID id = view_model->getUUID();
+    // Schedule updating the folder view context menu when all selected items become complete (STORM-373).
+    mCompletionObserver->reset();
+    for (std::deque<LLFolderViewItem*>::const_iterator it = items.begin(); it != items.end(); ++it)
+    {
+        LLFolderViewModelItemInventory* view_model = static_cast<LLFolderViewModelItemInventory*>((*it)->getViewModelItem());
+        if (view_model)
+        {
+            LLUUID id = view_model->getUUID();
             if (!(*it)->areChildrenInited())
             {
                 const F64 max_time = 0.0001f;
                 mBuildViewsEndTime = LLTimer::getTotalSeconds() + max_time;
                 buildNewViews(id);
             }
-			LLViewerInventoryItem* inv_item = mInventory->getItem(id);
-
-			if (inv_item && !inv_item->isFinished())
-			{
-				mCompletionObserver->watchItem(id);
-			}
-		}
-	}
-
-	LLFolderView* fv = mFolderRoot.get();
-	if (fv->needsAutoRename()) // auto-selecting a new user-created asset and preparing to rename
-	{
-		fv->setNeedsAutoRename(FALSE);
-		if (items.size()) // new asset is visible and selected
-		{
-			fv->startRenamingSelectedItem();
-		}
+            LLViewerInventoryItem* inv_item = mInventory->getItem(id);
+
+            if (inv_item && !inv_item->isFinished())
+            {
+                mCompletionObserver->watchItem(id);
+            }
+        }
+    }
+
+    LLFolderView* fv = mFolderRoot.get();
+    if (fv->needsAutoRename()) // auto-selecting a new user-created asset and preparing to rename
+    {
+        fv->setNeedsAutoRename(FALSE);
+        if (items.size()) // new asset is visible and selected
+        {
+            fv->startRenamingSelectedItem();
+        }
         else
         {
             LL_DEBUGS("Inventory") << "Failed to start renemr, no items selected" << LL_ENDL;
         }
-	}
-
-	std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
-	LLFolderViewItem* prev_folder_item = getItemByID(mPreviousSelectedFolder);
-
-	if (selected_items.size() == 1)
-	{
-		std::set<LLFolderViewItem*>::const_iterator iter = selected_items.begin();
-		LLFolderViewItem* folder_item = (*iter);
-		if(folder_item && (folder_item != prev_folder_item))
-		{
-			LLFolderViewModelItemInventory* fve_listener = static_cast<LLFolderViewModelItemInventory*>(folder_item->getViewModelItem());
-			if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
-			{
-				if (fve_listener->getInventoryObject() && fve_listener->getInventoryObject()->getIsLinkType())
-				{
-					return;
-				}
-
-				if(prev_folder_item)
-				{
-					LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
-					if(prev_bridge)
-					{
-						prev_bridge->clearDisplayName();
-						prev_bridge->setShowDescendantsCount(false);
-						prev_folder_item->refresh();
-					}
-				}
-
-				LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
-				if(bridge)
-				{
-					bridge->clearDisplayName();
-					bridge->setShowDescendantsCount(true);
-					folder_item->refresh();
-					mPreviousSelectedFolder = bridge->getUUID();
-				}
-			}
-		}
-	}
-	else
-	{
-		if(prev_folder_item)
-		{
-			LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
-			if(prev_bridge)
-			{
-				prev_bridge->clearDisplayName();
-				prev_bridge->setShowDescendantsCount(false);
-				prev_folder_item->refresh();
-			}
-		}
-		mPreviousSelectedFolder = LLUUID();
-	}
+    }
+
+    std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
+    LLFolderViewItem* prev_folder_item = getItemByID(mPreviousSelectedFolder);
+
+    if (selected_items.size() == 1)
+    {
+        std::set<LLFolderViewItem*>::const_iterator iter = selected_items.begin();
+        LLFolderViewItem* folder_item = (*iter);
+        if(folder_item && (folder_item != prev_folder_item))
+        {
+            LLFolderViewModelItemInventory* fve_listener = static_cast<LLFolderViewModelItemInventory*>(folder_item->getViewModelItem());
+            if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
+            {
+                if (fve_listener->getInventoryObject() && fve_listener->getInventoryObject()->getIsLinkType())
+                {
+                    return;
+                }
+
+                if(prev_folder_item)
+                {
+                    LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
+                    if(prev_bridge)
+                    {
+                        prev_bridge->clearDisplayName();
+                        prev_bridge->setShowDescendantsCount(false);
+                        prev_folder_item->refresh();
+                    }
+                }
+
+                LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
+                if(bridge)
+                {
+                    bridge->clearDisplayName();
+                    bridge->setShowDescendantsCount(true);
+                    folder_item->refresh();
+                    mPreviousSelectedFolder = bridge->getUUID();
+                }
+            }
+        }
+    }
+    else
+    {
+        if(prev_folder_item)
+        {
+            LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
+            if(prev_bridge)
+            {
+                prev_bridge->clearDisplayName();
+                prev_bridge->setShowDescendantsCount(false);
+                prev_folder_item->refresh();
+            }
+        }
+        mPreviousSelectedFolder = LLUUID();
+    }
 
 }
 
 void LLInventoryPanel::updateFolderLabel(const LLUUID& folder_id)
 {
-	if(folder_id != mPreviousSelectedFolder) return;
+    if(folder_id != mPreviousSelectedFolder) return;
 
-	LLFolderViewItem* folder_item = getItemByID(mPreviousSelectedFolder);
-	if(folder_item)
-	{
-		LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
-		if(bridge)
-		{
-			bridge->clearDisplayName();
-			bridge->setShowDescendantsCount(true);
-			folder_item->refresh();
-		}
-	}
+    LLFolderViewItem* folder_item = getItemByID(mPreviousSelectedFolder);
+    if(folder_item)
+    {
+        LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
+        if(bridge)
+        {
+            bridge->clearDisplayName();
+            bridge->setShowDescendantsCount(true);
+            folder_item->refresh();
+        }
+    }
 }
 
 void LLInventoryPanel::doCreate(const LLSD& userdata)
 {
-	reset_inventory_filter();
-	menu_create_inventory_item(this, LLFolderBridge::sSelf.get(), userdata);
+    reset_inventory_filter();
+    menu_create_inventory_item(this, LLFolderBridge::sSelf.get(), userdata);
 }
 
 bool LLInventoryPanel::beginIMSession()
 {
-	std::set<LLFolderViewItem*> selected_items =   mFolderRoot.get()->getSelectionList();
-
-	std::string name;
-
-	std::vector<LLUUID> members;
-	EInstantMessage type = IM_SESSION_CONFERENCE_START;
-
-	std::set<LLFolderViewItem*>::const_iterator iter;
-	for (iter = selected_items.begin(); iter != selected_items.end(); iter++)
-	{
-
-		LLFolderViewItem* folder_item = (*iter);
-			
-		if(folder_item) 
-		{
-			LLFolderViewModelItemInventory* fve_listener = static_cast<LLFolderViewModelItemInventory*>(folder_item->getViewModelItem());
-			if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
-			{
-
-				LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
-				if(!bridge) return true;
-				LLViewerInventoryCategory* cat = bridge->getCategory();
-				if(!cat) return true;
-				name = cat->getName();
-				LLUniqueBuddyCollector is_buddy;
-				LLInventoryModel::cat_array_t cat_array;
-				LLInventoryModel::item_array_t item_array;
-				gInventory.collectDescendentsIf(bridge->getUUID(),
-												cat_array,
-												item_array,
-												LLInventoryModel::EXCLUDE_TRASH,
-												is_buddy);
-				S32 count = item_array.size();
-				if(count > 0)
-				{
-					//*TODO by what to replace that?
-					//LLFloaterReg::showInstance("communicate");
-
-					// create the session
-					LLAvatarTracker& at = LLAvatarTracker::instance();
-					LLUUID id;
-					for(S32 i = 0; i < count; ++i)
-					{
-						id = item_array.at(i)->getCreatorUUID();
-						if(at.isBuddyOnline(id))
-						{
-							members.push_back(id);
-						}
-					}
-				}
-			}
-			else
-			{
-				LLInvFVBridge* listenerp = (LLInvFVBridge*)folder_item->getViewModelItem();
-
-				if (listenerp->getInventoryType() == LLInventoryType::IT_CALLINGCARD)
-				{
-					LLInventoryItem* inv_item = gInventory.getItem(listenerp->getUUID());
-
-					if (inv_item)
-					{
-						LLAvatarTracker& at = LLAvatarTracker::instance();
-						LLUUID id = inv_item->getCreatorUUID();
-
-						if(at.isBuddyOnline(id))
-						{
-							members.push_back(id);
-						}
-					}
-				} //if IT_CALLINGCARD
-			} //if !IT_CATEGORY
-		}
-	} //for selected_items	
-
-	// the session_id is randomly generated UUID which will be replaced later
-	// with a server side generated number
-
-	if (name.empty())
-	{
-		name = LLTrans::getString("conference-title");
-	}
-
-	LLUUID session_id = gIMMgr->addSession(name, type, members[0], members);
-	if (session_id != LLUUID::null)
-	{
-		LLFloaterIMContainer::getInstance()->showConversation(session_id);
-	}
-		
-	return true;
+    std::set<LLFolderViewItem*> selected_items =   mFolderRoot.get()->getSelectionList();
+
+    std::string name;
+
+    std::vector<LLUUID> members;
+    EInstantMessage type = IM_SESSION_CONFERENCE_START;
+
+    std::set<LLFolderViewItem*>::const_iterator iter;
+    for (iter = selected_items.begin(); iter != selected_items.end(); iter++)
+    {
+
+        LLFolderViewItem* folder_item = (*iter);
+
+        if(folder_item)
+        {
+            LLFolderViewModelItemInventory* fve_listener = static_cast<LLFolderViewModelItemInventory*>(folder_item->getViewModelItem());
+            if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
+            {
+
+                LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
+                if(!bridge) return true;
+                LLViewerInventoryCategory* cat = bridge->getCategory();
+                if(!cat) return true;
+                name = cat->getName();
+                LLUniqueBuddyCollector is_buddy;
+                LLInventoryModel::cat_array_t cat_array;
+                LLInventoryModel::item_array_t item_array;
+                gInventory.collectDescendentsIf(bridge->getUUID(),
+                                                cat_array,
+                                                item_array,
+                                                LLInventoryModel::EXCLUDE_TRASH,
+                                                is_buddy);
+                S32 count = item_array.size();
+                if(count > 0)
+                {
+                    //*TODO by what to replace that?
+                    //LLFloaterReg::showInstance("communicate");
+
+                    // create the session
+                    LLAvatarTracker& at = LLAvatarTracker::instance();
+                    LLUUID id;
+                    for(S32 i = 0; i < count; ++i)
+                    {
+                        id = item_array.at(i)->getCreatorUUID();
+                        if(at.isBuddyOnline(id))
+                        {
+                            members.push_back(id);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                LLInvFVBridge* listenerp = (LLInvFVBridge*)folder_item->getViewModelItem();
+
+                if (listenerp->getInventoryType() == LLInventoryType::IT_CALLINGCARD)
+                {
+                    LLInventoryItem* inv_item = gInventory.getItem(listenerp->getUUID());
+
+                    if (inv_item)
+                    {
+                        LLAvatarTracker& at = LLAvatarTracker::instance();
+                        LLUUID id = inv_item->getCreatorUUID();
+
+                        if(at.isBuddyOnline(id))
+                        {
+                            members.push_back(id);
+                        }
+                    }
+                } //if IT_CALLINGCARD
+            } //if !IT_CATEGORY
+        }
+    } //for selected_items
+
+    // the session_id is randomly generated UUID which will be replaced later
+    // with a server side generated number
+
+    if (name.empty())
+    {
+        name = LLTrans::getString("conference-title");
+    }
+
+    LLUUID session_id = gIMMgr->addSession(name, type, members[0], members);
+    if (session_id != LLUUID::null)
+    {
+        LLFloaterIMContainer::getInstance()->showConversation(session_id);
+    }
+
+    return true;
 }
 
 void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
@@ -1851,110 +1851,110 @@ void LLInventoryPanel::callbackPurgeSelectedItems(const LLSD& notification, cons
 
 bool LLInventoryPanel::attachObject(const LLSD& userdata)
 {
-	// Copy selected item UUIDs to a vector.
-	std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
-	uuid_vec_t items;
-	for (std::set<LLFolderViewItem*>::const_iterator set_iter = selected_items.begin();
-		 set_iter != selected_items.end(); 
-		 ++set_iter)
-	{
-		items.push_back(static_cast<LLFolderViewModelItemInventory*>((*set_iter)->getViewModelItem())->getUUID());
-	}
+    // Copy selected item UUIDs to a vector.
+    std::set<LLFolderViewItem*> selected_items = mFolderRoot.get()->getSelectionList();
+    uuid_vec_t items;
+    for (std::set<LLFolderViewItem*>::const_iterator set_iter = selected_items.begin();
+         set_iter != selected_items.end();
+         ++set_iter)
+    {
+        items.push_back(static_cast<LLFolderViewModelItemInventory*>((*set_iter)->getViewModelItem())->getUUID());
+    }
 
-	// Attach selected items.
-	LLViewerAttachMenu::attachObjects(items, userdata.asString());
+    // Attach selected items.
+    LLViewerAttachMenu::attachObjects(items, userdata.asString());
 
-	gFocusMgr.setKeyboardFocus(NULL);
+    gFocusMgr.setKeyboardFocus(NULL);
 
-	return true;
+    return true;
 }
 
 BOOL LLInventoryPanel::getSinceLogoff()
 {
-	return getFilter().isSinceLogoff();
+    return getFilter().isSinceLogoff();
 }
 
 // DEBUG ONLY
-// static 
+// static
 void LLInventoryPanel::dumpSelectionInformation(void* user_data)
 {
-	LLInventoryPanel* iv = (LLInventoryPanel*)user_data;
-	iv->mFolderRoot.get()->dumpSelectionInformation();
+    LLInventoryPanel* iv = (LLInventoryPanel*)user_data;
+    iv->mFolderRoot.get()->dumpSelectionInformation();
 }
 
 BOOL is_inventorysp_active()
 {
-	LLSidepanelInventory *sidepanel_inventory =	LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
-	if (!sidepanel_inventory || !sidepanel_inventory->isInVisibleChain()) return FALSE;
-	return sidepanel_inventory->isMainInventoryPanelActive();
+    LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
+    if (!sidepanel_inventory || !sidepanel_inventory->isInVisibleChain()) return FALSE;
+    return sidepanel_inventory->isMainInventoryPanelActive();
 }
 
 // static
 LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
 {
-	S32 z_min = S32_MAX;
-	LLInventoryPanel* res = NULL;
-	LLFloater* active_inv_floaterp = NULL;
-
-	LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
-	if (!floater_inventory)
-	{
-		LL_WARNS() << "Could not find My Inventory floater" << LL_ENDL;
-		return FALSE;
-	}
-
-	LLSidepanelInventory *inventory_panel =	LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
-
-	// Iterate through the inventory floaters and return whichever is on top.
-	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
-	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
-	{
-		LLFloaterSidePanelContainer* inventory_floater = dynamic_cast<LLFloaterSidePanelContainer*>(*iter);
-		inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
-
-		if (inventory_floater && inventory_panel && inventory_floater->getVisible())
-		{
-			S32 z_order = gFloaterView->getZOrder(inventory_floater);
-			if (z_order < z_min)
-			{
-				res = inventory_panel->getActivePanel();
-				z_min = z_order;
-				active_inv_floaterp = inventory_floater;
-			}
-		}
-	}
-
-	if (res)
-	{
-		// Make sure the floater is not minimized (STORM-438).
-		if (active_inv_floaterp && active_inv_floaterp->isMinimized())
-		{
-			active_inv_floaterp->setMinimized(FALSE);
-		}
-	}	
-	else if (auto_open)
-	{
-		floater_inventory->openFloater();
-
-		res = inventory_panel->getActivePanel();
-	}
-
-	return res;
+    S32 z_min = S32_MAX;
+    LLInventoryPanel* res = NULL;
+    LLFloater* active_inv_floaterp = NULL;
+
+    LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
+    if (!floater_inventory)
+    {
+        LL_WARNS() << "Could not find My Inventory floater" << LL_ENDL;
+        return FALSE;
+    }
+
+    LLSidepanelInventory *inventory_panel = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
+
+    // Iterate through the inventory floaters and return whichever is on top.
+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
+    {
+        LLFloaterSidePanelContainer* inventory_floater = dynamic_cast<LLFloaterSidePanelContainer*>(*iter);
+        inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
+
+        if (inventory_floater && inventory_panel && inventory_floater->getVisible())
+        {
+            S32 z_order = gFloaterView->getZOrder(inventory_floater);
+            if (z_order < z_min)
+            {
+                res = inventory_panel->getActivePanel();
+                z_min = z_order;
+                active_inv_floaterp = inventory_floater;
+            }
+        }
+    }
+
+    if (res)
+    {
+        // Make sure the floater is not minimized (STORM-438).
+        if (active_inv_floaterp && active_inv_floaterp->isMinimized())
+        {
+            active_inv_floaterp->setMinimized(FALSE);
+        }
+    }
+    else if (auto_open)
+    {
+        floater_inventory->openFloater();
+
+        res = inventory_panel->getActivePanel();
+    }
+
+    return res;
 }
 
 //static
 void LLInventoryPanel::openInventoryPanelAndSetSelection(bool auto_open, const LLUUID& obj_id,
-	bool use_main_panel, bool take_keyboard_focus, bool reset_filter)
+    bool use_main_panel, bool take_keyboard_focus, bool reset_filter)
 {
-	LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
-	sidepanel_inventory->showInventoryPanel();
+    LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
+    sidepanel_inventory->showInventoryPanel();
 
-	LLUUID cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
-	bool in_inbox = gInventory.isObjectDescendentOf(obj_id, cat_id);
-	if (!in_inbox && use_main_panel)
-	{
-		sidepanel_inventory->selectAllItemsPanel();
-	}
+    LLUUID cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
+    bool in_inbox = gInventory.isObjectDescendentOf(obj_id, cat_id);
+    if (!in_inbox && use_main_panel)
+    {
+        sidepanel_inventory->selectAllItemsPanel();
+    }
 
     if (!auto_open)
     {
@@ -1988,40 +1988,40 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(bool auto_open, const L
         }
     }
 
-	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
-	if (active_panel)
-	{
-		LL_DEBUGS("Messaging", "Inventory") << "Highlighting" << obj_id  << LL_ENDL;
-
-		if (reset_filter)
-		{
-			reset_inventory_filter();
-		}
-
-		if (in_inbox)
-		{
-			sidepanel_inventory->openInbox();
-			LLInventoryPanel* inventory_panel = sidepanel_inventory->getInboxPanel();
-			if (inventory_panel)
-			{
-				inventory_panel->setSelection(obj_id, take_keyboard_focus);
-			}
-		}
-		else if (auto_open)
-		{
-			LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
-			if (floater_inventory)
-			{
-				floater_inventory->setFocus(TRUE);
-			}
-			active_panel->setSelection(obj_id, take_keyboard_focus);
-		}
+    LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
+    if (active_panel)
+    {
+        LL_DEBUGS("Messaging", "Inventory") << "Highlighting" << obj_id  << LL_ENDL;
+
+        if (reset_filter)
+        {
+            reset_inventory_filter();
+        }
+
+        if (in_inbox)
+        {
+            sidepanel_inventory->openInbox();
+            LLInventoryPanel* inventory_panel = sidepanel_inventory->getInboxPanel();
+            if (inventory_panel)
+            {
+                inventory_panel->setSelection(obj_id, take_keyboard_focus);
+            }
+        }
+        else if (auto_open)
+        {
+            LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
+            if (floater_inventory)
+            {
+                floater_inventory->setFocus(TRUE);
+            }
+            active_panel->setSelection(obj_id, take_keyboard_focus);
+        }
         else
         {
             // Created items are going to receive proper focus from callbacks
             active_panel->setSelection(obj_id, take_keyboard_focus);
         }
-	}
+    }
 }
 
 void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id)
@@ -2044,66 +2044,66 @@ void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, con
 
 void LLInventoryPanel::addHideFolderType(LLFolderType::EType folder_type)
 {
-	getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << folder_type));
+    getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << folder_type));
 }
 
 BOOL LLInventoryPanel::getIsHiddenFolderType(LLFolderType::EType folder_type) const
 {
-	return !(getFilter().getFilterCategoryTypes() & (1ULL << folder_type));
+    return !(getFilter().getFilterCategoryTypes() & (1ULL << folder_type));
 }
 
 void LLInventoryPanel::addItemID( const LLUUID& id, LLFolderViewItem*   itemp )
 {
-	mItemMap[id] = itemp;
+    mItemMap[id] = itemp;
 }
 
 void LLInventoryPanel::removeItemID(const LLUUID& id)
 {
-	LLInventoryModel::cat_array_t categories;
-	LLInventoryModel::item_array_t items;
-	gInventory.collectDescendents(id, categories, items, TRUE);
+    LLInventoryModel::cat_array_t categories;
+    LLInventoryModel::item_array_t items;
+    gInventory.collectDescendents(id, categories, items, TRUE);
 
-	mItemMap.erase(id);
+    mItemMap.erase(id);
 
-	for (LLInventoryModel::cat_array_t::iterator it = categories.begin(),    end_it = categories.end();
-		it != end_it;
-		++it)
-	{
-		mItemMap.erase((*it)->getUUID());
+    for (LLInventoryModel::cat_array_t::iterator it = categories.begin(),    end_it = categories.end();
+        it != end_it;
+        ++it)
+    {
+        mItemMap.erase((*it)->getUUID());
 }
 
-	for (LLInventoryModel::item_array_t::iterator it = items.begin(),   end_it  = items.end();
-		it != end_it;
-		++it)
-	{
-		mItemMap.erase((*it)->getUUID());
-	}
+    for (LLInventoryModel::item_array_t::iterator it = items.begin(),   end_it  = items.end();
+        it != end_it;
+        ++it)
+    {
+        mItemMap.erase((*it)->getUUID());
+    }
 }
 
 LLFolderViewItem* LLInventoryPanel::getItemByID(const LLUUID& id)
 {
     LL_PROFILE_ZONE_SCOPED;
 
-	std::map<LLUUID, LLFolderViewItem*>::iterator map_it;
-	map_it = mItemMap.find(id);
-	if (map_it != mItemMap.end())
-	{
-		return map_it->second;
-	}
+    std::map<LLUUID, LLFolderViewItem*>::iterator map_it;
+    map_it = mItemMap.find(id);
+    if (map_it != mItemMap.end())
+    {
+        return map_it->second;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 LLFolderViewFolder* LLInventoryPanel::getFolderByID(const LLUUID& id)
 {
-	LLFolderViewItem* item = getItemByID(id);
-	return dynamic_cast<LLFolderViewFolder*>(item);
+    LLFolderViewItem* item = getItemByID(id);
+    return dynamic_cast<LLFolderViewFolder*>(item);
 }
 
 
 void LLInventoryPanel::setSelectionByID( const LLUUID& obj_id, BOOL    take_keyboard_focus )
 {
-	LLFolderViewItem* itemp = getItemByID(obj_id);
+    LLFolderViewItem* itemp = getItemByID(obj_id);
 
     if (itemp && !itemp->areChildrenInited())
     {
@@ -2114,109 +2114,109 @@ void LLInventoryPanel::setSelectionByID( const LLUUID& obj_id, BOOL    take_keyb
         }
     }
 
-	if(itemp && itemp->getViewModelItem())
-	{
-		itemp->arrangeAndSet(TRUE, take_keyboard_focus);
-		mSelectThisID.setNull();
-		mFocusSelection = false;
-		return;
-	}
-	else
-	{
-		// save the desired item to be selected later (if/when ready)
-		mFocusSelection = take_keyboard_focus;
-		mSelectThisID = obj_id;
-	}
+    if(itemp && itemp->getViewModelItem())
+    {
+        itemp->arrangeAndSet(TRUE, take_keyboard_focus);
+        mSelectThisID.setNull();
+        mFocusSelection = false;
+        return;
+    }
+    else
+    {
+        // save the desired item to be selected later (if/when ready)
+        mFocusSelection = take_keyboard_focus;
+        mSelectThisID = obj_id;
+    }
 }
 
 void LLInventoryPanel::updateSelection()
 {
-	if (mSelectThisID.notNull())
-	{
-		setSelectionByID(mSelectThisID, mFocusSelection);
-	}
+    if (mSelectThisID.notNull())
+    {
+        setSelectionByID(mSelectThisID, mFocusSelection);
+    }
 }
 
 void LLInventoryPanel::doToSelected(const LLSD& userdata)
 {
-	if (("purge" == userdata.asString()))
-	{
-		purgeSelectedItems();
-		return;
-	}
-	LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), userdata.asString());
+    if (("purge" == userdata.asString()))
+    {
+        purgeSelectedItems();
+        return;
+    }
+    LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), userdata.asString());
 
-	return;
+    return;
 }
 
 BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
 {
-	BOOL handled = FALSE;
-	switch (key)
-	{
-	case KEY_RETURN:
-		// Open selected items if enter key hit on the inventory panel
-		if (mask == MASK_NONE)
-		{
-			if (mSuppressOpenItemAction)
-			{
-				LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
-				if(folder_item)
-				{
-					LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
-					if(bridge && (bridge->getInventoryType() != LLInventoryType::IT_CATEGORY))
-					{
-						return handled;
-					}
-				}
-			}
-			LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), "open");
-			handled = TRUE;
-		}
-		break;
-	case KEY_DELETE:
+    BOOL handled = FALSE;
+    switch (key)
+    {
+    case KEY_RETURN:
+        // Open selected items if enter key hit on the inventory panel
+        if (mask == MASK_NONE)
+        {
+            if (mSuppressOpenItemAction)
+            {
+                LLFolderViewItem* folder_item = mFolderRoot.get()->getCurSelectedItem();
+                if(folder_item)
+                {
+                    LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+                    if(bridge && (bridge->getInventoryType() != LLInventoryType::IT_CATEGORY))
+                    {
+                        return handled;
+                    }
+                }
+            }
+            LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), "open");
+            handled = TRUE;
+        }
+        break;
+    case KEY_DELETE:
 #if LL_DARWIN
-	case KEY_BACKSPACE:
+    case KEY_BACKSPACE:
 #endif
-		// Delete selected items if delete or backspace key hit on the inventory panel
-		// Note: on Mac laptop keyboards, backspace and delete are one and the same
-		if (isSelectionRemovable() && (mask == MASK_NONE))
-		{
-			LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), "delete");
-			handled = TRUE;
-		}
-		break;
-	}
-	return handled;
+        // Delete selected items if delete or backspace key hit on the inventory panel
+        // Note: on Mac laptop keyboards, backspace and delete are one and the same
+        if (isSelectionRemovable() && (mask == MASK_NONE))
+        {
+            LLInventoryAction::doToSelected(mInventory, mFolderRoot.get(), "delete");
+            handled = TRUE;
+        }
+        break;
+    }
+    return handled;
 }
 
 bool LLInventoryPanel::isSelectionRemovable()
 {
-	bool can_delete = false;
-	if (mFolderRoot.get())
-	{
-		std::set<LLFolderViewItem*> selection_set = mFolderRoot.get()->getSelectionList();
-		if (!selection_set.empty()) 
-		{
-			can_delete = true;
-			for (std::set<LLFolderViewItem*>::iterator iter = selection_set.begin();
-				 iter != selection_set.end();
-				 ++iter)
-			{
-				LLFolderViewItem *item = *iter;
-				const LLFolderViewModelItemInventory *listener = static_cast<const LLFolderViewModelItemInventory*>(item->getViewModelItem());
-				if (!listener)
-				{
-					can_delete = false;
-				}
-				else
-				{
-					can_delete &= listener->isItemRemovable() && !listener->isItemInTrash();
-				}
-			}
-		}
-	}
-	return can_delete;
+    bool can_delete = false;
+    if (mFolderRoot.get())
+    {
+        std::set<LLFolderViewItem*> selection_set = mFolderRoot.get()->getSelectionList();
+        if (!selection_set.empty())
+        {
+            can_delete = true;
+            for (std::set<LLFolderViewItem*>::iterator iter = selection_set.begin();
+                 iter != selection_set.end();
+                 ++iter)
+            {
+                LLFolderViewItem *item = *iter;
+                const LLFolderViewModelItemInventory *listener = static_cast<const LLFolderViewModelItemInventory*>(item->getViewModelItem());
+                if (!listener)
+                {
+                    can_delete = false;
+                }
+                else
+                {
+                    can_delete &= listener->isItemRemovable() && !listener->isItemInTrash();
+                }
+            }
+        }
+    }
+    return can_delete;
 }
 
 /************************************************************************/
@@ -2226,28 +2226,28 @@ static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER;
 class LLInventoryRecentItemsPanel : public LLInventoryPanel
 {
 public:
-	struct Params :	public LLInitParam::Block<Params, LLInventoryPanel::Params>
-	{};
-
-	void initFromParams(const Params& p)
-	{
-		LLInventoryPanel::initFromParams(p);
-		// turn on inbox for recent items
-		getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() | (1ULL << LLFolderType::FT_INBOX));
+    struct Params : public LLInitParam::Block<Params, LLInventoryPanel::Params>
+    {};
+
+    void initFromParams(const Params& p)
+    {
+        LLInventoryPanel::initFromParams(p);
+        // turn on inbox for recent items
+        getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() | (1ULL << LLFolderType::FT_INBOX));
         // turn off marketplace for recent items
         getFilter().setFilterNoMarketplaceFolder();
-	}
+    }
 
 protected:
-	LLInventoryRecentItemsPanel (const Params&);
-	friend class LLUICtrlFactory;
+    LLInventoryRecentItemsPanel (const Params&);
+    friend class LLUICtrlFactory;
 };
 
 LLInventoryRecentItemsPanel::LLInventoryRecentItemsPanel( const Params& params)
 : LLInventoryPanel(params)
 {
-	// replace bridge builder to have necessary View bridges.
-	mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;
+    // replace bridge builder to have necessary View bridges.
+    mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;
 }
 
 /************************************************************************/
@@ -2686,7 +2686,7 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
         mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
 
         buildNewViews(mFolderID);
-        
+
         LLFloater* root_floater = gFloaterView->getParentFloater(this);
         if(root_floater)
         {
@@ -2850,37 +2850,37 @@ void LLAssetFilteredInventoryPanel::itemChanged(const LLUUID& id, U32 mask, cons
 
 namespace LLInitParam
 {
-	void TypeValues<LLFolderType::EType>::declareValues()
-	{
-		declare(LLFolderType::lookup(LLFolderType::FT_TEXTURE)          , LLFolderType::FT_TEXTURE);
-		declare(LLFolderType::lookup(LLFolderType::FT_SOUND)            , LLFolderType::FT_SOUND);
-		declare(LLFolderType::lookup(LLFolderType::FT_CALLINGCARD)      , LLFolderType::FT_CALLINGCARD);
-		declare(LLFolderType::lookup(LLFolderType::FT_LANDMARK)         , LLFolderType::FT_LANDMARK);
-		declare(LLFolderType::lookup(LLFolderType::FT_CLOTHING)         , LLFolderType::FT_CLOTHING);
-		declare(LLFolderType::lookup(LLFolderType::FT_OBJECT)           , LLFolderType::FT_OBJECT);
-		declare(LLFolderType::lookup(LLFolderType::FT_NOTECARD)         , LLFolderType::FT_NOTECARD);
-		declare(LLFolderType::lookup(LLFolderType::FT_ROOT_INVENTORY)   , LLFolderType::FT_ROOT_INVENTORY);
-		declare(LLFolderType::lookup(LLFolderType::FT_LSL_TEXT)         , LLFolderType::FT_LSL_TEXT);
-		declare(LLFolderType::lookup(LLFolderType::FT_BODYPART)         , LLFolderType::FT_BODYPART);
-		declare(LLFolderType::lookup(LLFolderType::FT_TRASH)            , LLFolderType::FT_TRASH);
-		declare(LLFolderType::lookup(LLFolderType::FT_SNAPSHOT_CATEGORY), LLFolderType::FT_SNAPSHOT_CATEGORY);
-		declare(LLFolderType::lookup(LLFolderType::FT_LOST_AND_FOUND)   , LLFolderType::FT_LOST_AND_FOUND);
-		declare(LLFolderType::lookup(LLFolderType::FT_ANIMATION)        , LLFolderType::FT_ANIMATION);
-		declare(LLFolderType::lookup(LLFolderType::FT_GESTURE)          , LLFolderType::FT_GESTURE);
-		declare(LLFolderType::lookup(LLFolderType::FT_FAVORITE)         , LLFolderType::FT_FAVORITE);
-		declare(LLFolderType::lookup(LLFolderType::FT_ENSEMBLE_START)   , LLFolderType::FT_ENSEMBLE_START);
-		declare(LLFolderType::lookup(LLFolderType::FT_ENSEMBLE_END)     , LLFolderType::FT_ENSEMBLE_END);
-		declare(LLFolderType::lookup(LLFolderType::FT_CURRENT_OUTFIT)   , LLFolderType::FT_CURRENT_OUTFIT);
-		declare(LLFolderType::lookup(LLFolderType::FT_OUTFIT)           , LLFolderType::FT_OUTFIT);
-		declare(LLFolderType::lookup(LLFolderType::FT_MY_OUTFITS)       , LLFolderType::FT_MY_OUTFITS);
-		declare(LLFolderType::lookup(LLFolderType::FT_MESH )            , LLFolderType::FT_MESH );
-		declare(LLFolderType::lookup(LLFolderType::FT_INBOX)            , LLFolderType::FT_INBOX);
-		declare(LLFolderType::lookup(LLFolderType::FT_OUTBOX)           , LLFolderType::FT_OUTBOX);
-		declare(LLFolderType::lookup(LLFolderType::FT_BASIC_ROOT)       , LLFolderType::FT_BASIC_ROOT);
+    void TypeValues<LLFolderType::EType>::declareValues()
+    {
+        declare(LLFolderType::lookup(LLFolderType::FT_TEXTURE)          , LLFolderType::FT_TEXTURE);
+        declare(LLFolderType::lookup(LLFolderType::FT_SOUND)            , LLFolderType::FT_SOUND);
+        declare(LLFolderType::lookup(LLFolderType::FT_CALLINGCARD)      , LLFolderType::FT_CALLINGCARD);
+        declare(LLFolderType::lookup(LLFolderType::FT_LANDMARK)         , LLFolderType::FT_LANDMARK);
+        declare(LLFolderType::lookup(LLFolderType::FT_CLOTHING)         , LLFolderType::FT_CLOTHING);
+        declare(LLFolderType::lookup(LLFolderType::FT_OBJECT)           , LLFolderType::FT_OBJECT);
+        declare(LLFolderType::lookup(LLFolderType::FT_NOTECARD)         , LLFolderType::FT_NOTECARD);
+        declare(LLFolderType::lookup(LLFolderType::FT_ROOT_INVENTORY)   , LLFolderType::FT_ROOT_INVENTORY);
+        declare(LLFolderType::lookup(LLFolderType::FT_LSL_TEXT)         , LLFolderType::FT_LSL_TEXT);
+        declare(LLFolderType::lookup(LLFolderType::FT_BODYPART)         , LLFolderType::FT_BODYPART);
+        declare(LLFolderType::lookup(LLFolderType::FT_TRASH)            , LLFolderType::FT_TRASH);
+        declare(LLFolderType::lookup(LLFolderType::FT_SNAPSHOT_CATEGORY), LLFolderType::FT_SNAPSHOT_CATEGORY);
+        declare(LLFolderType::lookup(LLFolderType::FT_LOST_AND_FOUND)   , LLFolderType::FT_LOST_AND_FOUND);
+        declare(LLFolderType::lookup(LLFolderType::FT_ANIMATION)        , LLFolderType::FT_ANIMATION);
+        declare(LLFolderType::lookup(LLFolderType::FT_GESTURE)          , LLFolderType::FT_GESTURE);
+        declare(LLFolderType::lookup(LLFolderType::FT_FAVORITE)         , LLFolderType::FT_FAVORITE);
+        declare(LLFolderType::lookup(LLFolderType::FT_ENSEMBLE_START)   , LLFolderType::FT_ENSEMBLE_START);
+        declare(LLFolderType::lookup(LLFolderType::FT_ENSEMBLE_END)     , LLFolderType::FT_ENSEMBLE_END);
+        declare(LLFolderType::lookup(LLFolderType::FT_CURRENT_OUTFIT)   , LLFolderType::FT_CURRENT_OUTFIT);
+        declare(LLFolderType::lookup(LLFolderType::FT_OUTFIT)           , LLFolderType::FT_OUTFIT);
+        declare(LLFolderType::lookup(LLFolderType::FT_MY_OUTFITS)       , LLFolderType::FT_MY_OUTFITS);
+        declare(LLFolderType::lookup(LLFolderType::FT_MESH )            , LLFolderType::FT_MESH );
+        declare(LLFolderType::lookup(LLFolderType::FT_INBOX)            , LLFolderType::FT_INBOX);
+        declare(LLFolderType::lookup(LLFolderType::FT_OUTBOX)           , LLFolderType::FT_OUTBOX);
+        declare(LLFolderType::lookup(LLFolderType::FT_BASIC_ROOT)       , LLFolderType::FT_BASIC_ROOT);
         declare(LLFolderType::lookup(LLFolderType::FT_SETTINGS)         , LLFolderType::FT_SETTINGS);
         declare(LLFolderType::lookup(LLFolderType::FT_MATERIAL)         , LLFolderType::FT_MATERIAL);
-		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_LISTINGS)   , LLFolderType::FT_MARKETPLACE_LISTINGS);
-		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_STOCK), LLFolderType::FT_MARKETPLACE_STOCK);
-		declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_VERSION), LLFolderType::FT_MARKETPLACE_VERSION);
-	}
+        declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_LISTINGS)   , LLFolderType::FT_MARKETPLACE_LISTINGS);
+        declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_STOCK), LLFolderType::FT_MARKETPLACE_STOCK);
+        declare(LLFolderType::lookup(LLFolderType::FT_MARKETPLACE_VERSION), LLFolderType::FT_MARKETPLACE_VERSION);
+    }
 }