1 files changed, 100 insertions, 101 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 61dec963c5..3666c51c82 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -143,7 +143,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	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));
-	
+
 }
 
 void LLInventoryPanel::buildFolderView(const LLInventoryPanel::Params& params)
@@ -153,7 +153,7 @@ void LLInventoryPanel::buildFolderView(const LLInventoryPanel::Params& params)
 	const LLFolderType::EType preferred_type = LLViewerFolderType::lookupTypeFromNewCategoryName(params.start_folder);
 
 	LLUUID root_id;
-	
+
 	if ("LIBRARY" == params.start_folder())
 	{
 		root_id = gInventory.getLibraryRootFolderID();
@@ -165,27 +165,27 @@ void LLInventoryPanel::buildFolderView(const LLInventoryPanel::Params& params)
 				: LLUUID::null;
 	}
 
-		LLRect folder_rect(0,
-						   0,
-						   getRect().getWidth(),
-						   0);
-		LLFolderView::Params p;
-		p.name = getName();
-		p.title = getLabel();
-		p.rect = folder_rect;
-		p.parent_panel = this;
-		p.tool_tip = p.name;
+	LLRect folder_rect(0,
+						0,
+						getRect().getWidth(),
+						0);
+	LLFolderView::Params p;
+	p.name = getName();
+	p.title = getLabel();
+	p.rect = folder_rect;
+	p.parent_panel = this;
+	p.tool_tip = p.name;
 	p.listener =  mInvFVBridgeBuilder->createBridge(LLAssetType::AT_CATEGORY,
 													LLAssetType::AT_CATEGORY,
 													LLInventoryType::IT_CATEGORY,
 													this,
 													NULL,
 													root_id);
-		p.use_label_suffix = params.use_label_suffix;
+	p.use_label_suffix = params.use_label_suffix;
 	p.allow_multiselect = mAllowMultiSelect;
-		mFolderRoot = LLUICtrlFactory::create<LLFolderView>(p);
+	mFolderRoot = LLUICtrlFactory::create<LLFolderView>(p);
 	
-	}
+}
 
 void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
 {
@@ -458,9 +458,8 @@ void LLInventoryPanel::modelChanged(U32 mask)
 			// This item already exists in both memory and UI.  It was probably reparented.
 			if (model_item && view_item)
 			{
-				// Don't process the item if it's hanging from the root, since its
-				// model_item's parent will be NULL.
-				if (view_item->getRoot() != view_item->getParent())
+				// Don't process the item if it is the root
+				if (view_item->getRoot() != view_item)
 				{
 					LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolderRoot->getItemByID(model_item->getParentUUID());
 					// Item has been moved.
@@ -565,88 +564,88 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
  	LLFolderViewFolder* parent_folder = NULL;
  
  	if (id == root_id)
-		{
-			parent_folder = mFolderRoot;
-		}
+ 	{
+ 		parent_folder = mFolderRoot;
+ 	}
  	else if (objectp)
-		{
+ 	{
  		LLFolderViewItem* itemp = NULL;
  		const LLUUID &parent_id = objectp->getParentUUID();
  		parent_folder = (LLFolderViewFolder*)mFolderRoot->getItemByID(parent_id);
-		
+  		
   		if (parent_folder)
   		{
-		if (objectp->getType() <= LLAssetType::AT_NONE ||
-			objectp->getType() >= LLAssetType::AT_COUNT)
-		{
-			llwarns << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : "
+  			if (objectp->getType() <= LLAssetType::AT_NONE ||
+  				objectp->getType() >= LLAssetType::AT_COUNT)
+  			{
+  				llwarns << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : "
   						<< ((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID()
-					<< llendl;
-			return;
-		}
-		
-		if ((objectp->getType() == LLAssetType::AT_CATEGORY) &&
-			(objectp->getActualType() != LLAssetType::AT_LINK_FOLDER))
-		{
-			LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(objectp->getType(),
-																			objectp->getType(),
-																			LLInventoryType::IT_CATEGORY,
-																			this,
-																			mFolderRoot,
-																			objectp->getUUID());
-			if (new_listener)
-			{
-				LLFolderViewFolder::Params params;
-				params.name = new_listener->getDisplayName();
-				params.icon = new_listener->getIcon();
-				params.icon_open = new_listener->getOpenIcon();
-				if (mShowItemLinkOverlays) // if false, then links show up just like normal items
-				{
-					params.icon_overlay = LLUI::getUIImage("Inv_Link");
-				}
-				params.root = mFolderRoot;
-				params.listener = new_listener;
-				params.tool_tip = params.name;
-				LLFolderViewFolder* folderp = LLUICtrlFactory::create<LLFolderViewFolder>(params);
-				folderp->setItemSortOrder(mFolderRoot->getSortOrder());
-				itemp = folderp;
-				}
-			}
+  						<< llendl;
+  				return;
+  			}
+  		
+  			if ((objectp->getType() == LLAssetType::AT_CATEGORY) &&
+  				(objectp->getActualType() != LLAssetType::AT_LINK_FOLDER))
+  			{
+  				LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(objectp->getType(),
+  																				objectp->getType(),
+  																				LLInventoryType::IT_CATEGORY,
+  																				this,
+  																				mFolderRoot,
+  																				objectp->getUUID());
+  				if (new_listener)
+  				{
+  					LLFolderViewFolder::Params params;
+  					params.name = new_listener->getDisplayName();
+  					params.icon = new_listener->getIcon();
+  					params.icon_open = new_listener->getOpenIcon();
+  					if (mShowItemLinkOverlays) // if false, then links show up just like normal items
+  					{
+  						params.icon_overlay = LLUI::getUIImage("Inv_Link");
+  					}
+  					params.root = mFolderRoot;
+  					params.listener = new_listener;
+  					params.tool_tip = params.name;
+  					LLFolderViewFolder* folderp = LLUICtrlFactory::create<LLFolderViewFolder>(params);
+  					folderp->setItemSortOrder(mFolderRoot->getSortOrder());
+  					itemp = folderp;
+  				}
+  			}
   			else
-		{
-			// Build new view for item.
-			LLInventoryItem* item = (LLInventoryItem*)objectp;
-			LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
-																			item->getActualType(),
-																			item->getInventoryType(),
-																			this,
-																			mFolderRoot,
-																			item->getUUID(),
-																			item->getFlags());
-
-			if (new_listener)
-			{
-				LLFolderViewItem::Params params;
-				params.name = new_listener->getDisplayName();
-				params.icon = new_listener->getIcon();
-				params.icon_open = new_listener->getOpenIcon();
-				if (mShowItemLinkOverlays) // if false, then links show up just like normal items
-				{
-					params.icon_overlay = LLUI::getUIImage("Inv_Link");
-				}
-				params.creation_date = new_listener->getCreationDate();
-				params.root = mFolderRoot;
-				params.listener = new_listener;
-				params.rect = LLRect (0, 0, 0, 0);
-				params.tool_tip = params.name;
-				itemp = LLUICtrlFactory::create<LLFolderViewItem> (params);
-			}
-		}
-
-		if (itemp)
-		{
-			itemp->addToFolder(parent_folder, mFolderRoot);
-			}
+  			{
+  				// Build new view for item.
+  				LLInventoryItem* item = (LLInventoryItem*)objectp;
+  				LLInvFVBridge* new_listener = mInvFVBridgeBuilder->createBridge(item->getType(),
+  																				item->getActualType(),
+  																				item->getInventoryType(),
+  																				this,
+  																				mFolderRoot,
+  																				item->getUUID(),
+  																				item->getFlags());
+ 
+  				if (new_listener)
+  				{
+  					LLFolderViewItem::Params params;
+  					params.name = new_listener->getDisplayName();
+  					params.icon = new_listener->getIcon();
+  					params.icon_open = new_listener->getOpenIcon();
+  					if (mShowItemLinkOverlays) // if false, then links show up just like normal items
+  					{
+  						params.icon_overlay = LLUI::getUIImage("Inv_Link");
+  					}
+  					params.creation_date = new_listener->getCreationDate();
+  					params.root = mFolderRoot;
+  					params.listener = new_listener;
+  					params.rect = LLRect (0, 0, 0, 0);
+  					params.tool_tip = params.name;
+  					itemp = LLUICtrlFactory::create<LLFolderViewItem> (params);
+  				}
+  			}
+ 
+  			if (itemp)
+  			{
+  				itemp->addToFolder(parent_folder, mFolderRoot);
+   			}
 		}
 	}
 
@@ -688,20 +687,20 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 // 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->getFirstChild(); child; child = mFolderRoot->findNextSibling(child))
-		{
-			LLFolderViewFolder *fchild = dynamic_cast<LLFolderViewFolder*>(child);
+	// Find My Inventory folder and open it up by name
+	for (LLView *child = mFolderRoot->getFirstChild(); child; child = mFolderRoot->findNextSibling(child))
+	{
+		LLFolderViewFolder *fchild = dynamic_cast<LLFolderViewFolder*>(child);
 		if (fchild
 			&& fchild->getListener()
 				&& fchild->getListener()->getUUID() == gInventory.getRootFolderID())
-			{
-				const std::string& child_name = child->getName();
-				mFolderRoot->openFolder(child_name);
-				break;
-			}
+		{
+			const std::string& child_name = child->getName();
+			mFolderRoot->openFolder(child_name);
+			break;
 		}
 	}
+}
 
 void LLInventoryPanel::onItemsCompletion()
 {