Merge conflict resolution for previous commit.

--HG--
branch : avatar-pipeline

46 files changed, 4847 insertions, 2904 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0133d2222d..e138b431c5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -251,7 +251,9 @@ set(viewer_SOURCE_FILES
     llinventorybridge.cpp
     llinventoryclipboard.cpp
     llinventoryfilter.cpp
+    llinventoryfunctions.cpp
     llinventorymodel.cpp
+    llinventorypanel.cpp
     llinventorysubtreepanel.cpp
     lljoystickbutton.cpp
     lllandmarkactions.cpp
@@ -313,7 +315,6 @@ set(viewer_SOURCE_FILES
     llpanelgroupnotices.cpp
     llpanelgrouproles.cpp
     llpanelimcontrolpanel.cpp
-    llpanelinventory.cpp
     llpanelland.cpp
     llpanellandaudio.cpp
     llpanellandmarks.cpp
@@ -321,12 +322,14 @@ set(viewer_SOURCE_FILES
     llpanellogin.cpp
     llpanellookinfo.cpp
     llpanellooks.cpp
+    llpanelmaininventory.cpp
     llpanelmedia.cpp
     llpanelmediasettingsgeneral.cpp
     llpanelmediasettingspermissions.cpp
     llpanelmediasettingssecurity.cpp
     llpanelmeprofile.cpp
     llpanelobject.cpp
+    llpanelobjectinventory.cpp
     llpanelpeople.cpp
     llpanelpeoplemenus.cpp
     llpanelpermissions.cpp
@@ -366,6 +369,8 @@ set(viewer_SOURCE_FILES
     llsearchcombobox.cpp
     llsearchhistory.cpp
     llselectmgr.cpp
+    llsidepanelinventory.cpp
+    llsidepanelobjectinfo.cpp
     llsidetray.cpp
     llsidetraypanelcontainer.cpp
     llsky.cpp
@@ -731,7 +736,9 @@ set(viewer_HEADER_FILES
     llinventorybridge.h
     llinventoryclipboard.h
     llinventoryfilter.h
+    llinventoryfunctions.h
     llinventorymodel.h
+    llinventorypanel.h
     llinventorysubtreepanel.h
     lljoystickbutton.h
     lllandmarkactions.h
@@ -791,7 +798,6 @@ set(viewer_HEADER_FILES
     llpanelgroupnotices.h
     llpanelgrouproles.h
     llpanelimcontrolpanel.h
-    llpanelinventory.h
     llpanelland.h
     llpanellandaudio.h
     llpanellandmarks.h
@@ -799,12 +805,14 @@ set(viewer_HEADER_FILES
     llpanellogin.h
     llpanellookinfo.h
     llpanellooks.h
+    llpanelmaininventory.h
     llpanelmedia.h
     llpanelmediasettingsgeneral.h
     llpanelmediasettingspermissions.h
     llpanelmediasettingssecurity.h
     llpanelmeprofile.h
     llpanelobject.h
+    llpanelobjectinventory.h
     llpanelpeople.h
     llpanelpeoplemenus.h
     llpanelpermissions.h
@@ -846,6 +854,8 @@ set(viewer_HEADER_FILES
     llsearchcombobox.h
     llsearchhistory.h
     llselectmgr.h
+    llsidepanelinventory.h
+    llsidepanelobjectinfo.h
     llsidetray.h
     llsidetraypanelcontainer.h
     llsky.h
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 380469f5b3..81c899312d 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -39,6 +39,7 @@
 #include "llfloaterinventory.h"
 #include "llinventorybridge.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llnotify.h"
 #include "llviewerregion.h"
 #include "llvoavatarself.h"
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index cd3963050f..5dbf57c9be 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -41,6 +41,7 @@
 #include "llfilepicker.h"
 #include "llnotify.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 #include "llpermissionsflags.h"
 #include "llpreviewnotecard.h"
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index 9d07362edc..3da06fa7b3 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -45,6 +45,7 @@
 #include "llinventorymodel.h"	// for gInventory
 #include "llfloaterreg.h"
 #include "llfloaterinventory.h"	// for get_item_icon
+#include "llinventoryfunctions.h"
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
 #include "llviewerobject.h"
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 3a4171c6be..f3eaa0c916 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -45,6 +45,7 @@
 #include "llagent.h"			// for agent id
 #include "llalertdialog.h"
 #include "llcheckboxctrl.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodel.h"	// for gInventory
 #include "llfloaterreg.h"
 #include "llfloaterinventory.h"	// for get_item_icon
@@ -280,7 +281,7 @@ void LLFloaterBuyContents::onClickBuy()
 	// We may want to wear this item
 	if (childGetValue("wear_check"))
 	{
-		LLFloaterInventory::sWearNewClothing = TRUE;
+		LLInventoryState::sWearNewClothing = TRUE;
 	}
 
 	// Put the items where we put new folders.
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 1300103423..c114eed4a2 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -44,6 +44,7 @@
 #include "llcombobox.h"
 #include "llgesturemgr.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index a47916b7d7..89a9a317c2 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -1,1953 +1,155 @@
-/** 
- * @file llfloaterinventory.cpp
- * @brief Implementation of the inventory view and associated stuff.
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include <utility> // for std::pair<>
-
-#include "llfloaterinventory.h"
-
-// library includes
-#include "llagent.h"
-#include "llagentwearables.h"
-#include "llcallingcard.h"
-#include "llfloaterreg.h"
-#include "llsdserialize.h"
-#include "llfiltereditor.h"
-#include "llspinctrl.h"
-#include "llui.h"
-#include "message.h"
-
-// newview includes
-#include "llappearancemgr.h"
-#include "llappviewer.h"
-#include "llfirstuse.h"
-#include "llfloaterchat.h"
-#include "llfloatercustomize.h"
-#include "llfocusmgr.h"
-#include "llfolderview.h"
-#include "llgesturemgr.h"
-#include "lliconctrl.h"
-#include "llimview.h"
-#include "llinventorybridge.h"
-#include "llinventoryclipboard.h"
-#include "llinventorymodel.h"
-#include "lllineeditor.h"
-#include "llmenugl.h"
-#include "llpreviewanim.h"
-#include "llpreviewgesture.h"
-#include "llpreviewnotecard.h"
-#include "llpreviewscript.h"
-#include "llpreviewsound.h"
-#include "llpreviewtexture.h"
-#include "llresmgr.h"
-#include "llscrollbar.h"
-#include "llscrollcontainer.h"
-#include "llselectmgr.h"
-#include "lltabcontainer.h"
-#include "lltooldraganddrop.h"
-#include "lluictrlfactory.h"
-#include "llviewerinventory.h"
-#include "llviewermessage.h"
-#include "llviewerobjectlist.h"
-#include "llviewerregion.h"
-#include "llviewerwindow.h"
-#include "llvoavatarself.h"
-#include "llwearablelist.h"
-
-static LLDefaultChildRegistry::Register<LLInventoryPanel> r("inventory_panel");
-
-//BOOL LLFloaterInventory::sOpenNextNewItem = FALSE;
-BOOL LLFloaterInventory::sWearNewClothing = FALSE;
-LLUUID LLFloaterInventory::sWearNewClothingTransactionID;
-
-///----------------------------------------------------------------------------
-/// LLFloaterInventoryFinder
-///----------------------------------------------------------------------------
-
-LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLFloaterInventory* inventory_view)
-:	LLFloater(LLSD()),
-	mFloaterInventory(inventory_view),
-	mFilter(inventory_view->mActivePanel->getFilter())
-{
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml", NULL);
-	updateElementsFromFilter();
-}
-
-
-void LLFloaterInventoryFinder::onCheckSinceLogoff(LLUICtrl *ctrl, void *user_data)
-{
-	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;
-	if (!self) return;
-
-	bool since_logoff= self->childGetValue("check_since_logoff");
-	
-	if (!since_logoff && 
-	    !(  self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() ) )
-	{
-		self->mSpinSinceHours->set(1.0f);
-	}	
-}
-BOOL LLFloaterInventoryFinder::postBuild()
-{
-	const LLRect& viewrect = mFloaterInventory->getRect();
-	setRect(LLRect(viewrect.mLeft - getRect().getWidth(), viewrect.mTop, viewrect.mLeft, viewrect.mTop - getRect().getHeight()));
-
-	childSetAction("All", selectAllTypes, this);
-	childSetAction("None", selectNoTypes, this);
-
-	mSpinSinceHours = getChild<LLSpinCtrl>("spin_hours_ago");
-	childSetCommitCallback("spin_hours_ago", onTimeAgo, this);
-
-	mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
-	childSetCommitCallback("spin_days_ago", onTimeAgo, this);
-
-	//	mCheckSinceLogoff   = getChild<LLSpinCtrl>("check_since_logoff");
-	childSetCommitCallback("check_since_logoff", onCheckSinceLogoff, this);
-
-	childSetAction("Close", onCloseBtn, this);
-
-	updateElementsFromFilter();
-	return TRUE;
-}
-void LLFloaterInventoryFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
-{
-	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;
-	if (!self) return;
-	
-	bool since_logoff=true;
-	if ( self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() )
-	{
-		since_logoff = false;
-	}
-	self->childSetValue("check_since_logoff", since_logoff);
-}
-
-void LLFloaterInventoryFinder::changeFilter(LLInventoryFilter* filter)
-{
-	mFilter = filter;
-	updateElementsFromFilter();
-}
-
-void LLFloaterInventoryFinder::updateElementsFromFilter()
-{
-	if (!mFilter)
-		return;
-
-	// Get data needed for filter display
-	U32 filter_types = mFilter->getFilterTypes();
-	std::string filter_string = mFilter->getFilterSubString();
-	LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
-	U32 hours = mFilter->getHoursAgo();
-
-	// update the ui elements
-	LLFloater::setTitle(mFilter->getName());
-	childSetValue("check_animation", (S32) (filter_types & 0x1 << LLInventoryType::IT_ANIMATION));
-
-	childSetValue("check_calling_card", (S32) (filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));
-	childSetValue("check_clothing", (S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
-	childSetValue("check_gesture", (S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));
-	childSetValue("check_landmark", (S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
-	childSetValue("check_notecard", (S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
-	childSetValue("check_object", (S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));
-	childSetValue("check_script", (S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));
-	childSetValue("check_sound", (S32) (filter_types & 0x1 << LLInventoryType::IT_SOUND));
-	childSetValue("check_texture", (S32) (filter_types & 0x1 << LLInventoryType::IT_TEXTURE));
-	childSetValue("check_snapshot", (S32) (filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));
-	childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
-	childSetValue("check_since_logoff", mFilter->isSinceLogoff());
-	mSpinSinceHours->set((F32)(hours % 24));
-	mSpinSinceDays->set((F32)(hours / 24));
-}
-
-void LLFloaterInventoryFinder::draw()
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_DRAW);
-	U32 filter = 0xffffffff;
-	BOOL filtered_by_all_types = TRUE;
-
-	if (!childGetValue("check_animation"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_ANIMATION);
-		filtered_by_all_types = FALSE;
-	}
-
-
-	if (!childGetValue("check_calling_card"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_CALLINGCARD);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_clothing"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_WEARABLE);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_gesture"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_GESTURE);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_landmark"))
-
-
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_LANDMARK);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_notecard"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_NOTECARD);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_object"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_OBJECT);
-		filter &= ~(0x1 << LLInventoryType::IT_ATTACHMENT);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_script"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_LSL);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_sound"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_SOUND);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_texture"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_TEXTURE);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!childGetValue("check_snapshot"))
-	{
-		filter &= ~(0x1 << LLInventoryType::IT_SNAPSHOT);
-		filtered_by_all_types = FALSE;
-	}
-
-	if (!filtered_by_all_types)
-	{
-		// don't include folders in filter, unless I've selected everything
-		filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);
-	}
-
-	// update the panel, panel will update the filter
-	mFloaterInventory->mActivePanel->setShowFolderState(getCheckShowEmpty() ?
-		LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-	mFloaterInventory->mActivePanel->setFilterTypes(filter);
-	if (getCheckSinceLogoff())
-	{
-		mSpinSinceDays->set(0);
-		mSpinSinceHours->set(0);
-	}
-	U32 days = (U32)mSpinSinceDays->get();
-	U32 hours = (U32)mSpinSinceHours->get();
-	if (hours > 24)
-	{
-		days += hours / 24;
-		hours = (U32)hours % 24;
-		mSpinSinceDays->set((F32)days);
-		mSpinSinceHours->set((F32)hours);
-	}
-	hours += days * 24;
-	mFloaterInventory->mActivePanel->setHoursAgo(hours);
-	mFloaterInventory->mActivePanel->setSinceLogoff(getCheckSinceLogoff());
-	mFloaterInventory->setFilterTextFromFilter();
-
-	LLFloater::draw();
-}
-
-BOOL LLFloaterInventoryFinder::getCheckShowEmpty()
-{
-	return childGetValue("check_show_empty");
-}
-
-BOOL LLFloaterInventoryFinder::getCheckSinceLogoff()
-{
-	return childGetValue("check_since_logoff");
-}
-
-void LLFloaterInventoryFinder::onCloseBtn(void* user_data)
-{
-	LLFloaterInventoryFinder* finderp = (LLFloaterInventoryFinder*)user_data;
-	finderp->closeFloater();
-}
-
-// static
-void LLFloaterInventoryFinder::selectAllTypes(void* user_data)
-{
-	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;
-	if(!self) return;
-
-	self->childSetValue("check_animation", TRUE);
-	self->childSetValue("check_calling_card", TRUE);
-	self->childSetValue("check_clothing", TRUE);
-	self->childSetValue("check_gesture", TRUE);
-	self->childSetValue("check_landmark", TRUE);
-	self->childSetValue("check_notecard", TRUE);
-	self->childSetValue("check_object", TRUE);
-	self->childSetValue("check_script", TRUE);
-	self->childSetValue("check_sound", TRUE);
-	self->childSetValue("check_texture", TRUE);
-	self->childSetValue("check_snapshot", TRUE);
-
-/*
-	self->mCheckCallingCard->set(TRUE);
-	self->mCheckClothing->set(TRUE);
-	self->mCheckGesture->set(TRUE);
-	self->mCheckLandmark->set(TRUE);
-	self->mCheckNotecard->set(TRUE);
-	self->mCheckObject->set(TRUE);
-	self->mCheckScript->set(TRUE);
-	self->mCheckSound->set(TRUE);
-	self->mCheckTexture->set(TRUE);
-	self->mCheckSnapshot->set(TRUE);*/
-}
-
-//static
-void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
-{
-	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;
-	if(!self) return;
-
-	/*
-	self->childSetValue("check_animation", FALSE);
-	self->mCheckCallingCard->set(FALSE);
-	self->mCheckClothing->set(FALSE);
-	self->mCheckGesture->set(FALSE);
-	self->mCheckLandmark->set(FALSE);
-	self->mCheckNotecard->set(FALSE);
-	self->mCheckObject->set(FALSE);
-	self->mCheckScript->set(FALSE);
-	self->mCheckSound->set(FALSE);
-	self->mCheckTexture->set(FALSE);
-	self->mCheckSnapshot->set(FALSE);*/
-
-
-	self->childSetValue("check_animation", FALSE);
-	self->childSetValue("check_calling_card", FALSE);
-	self->childSetValue("check_clothing", FALSE);
-	self->childSetValue("check_gesture", FALSE);
-	self->childSetValue("check_landmark", FALSE);
-	self->childSetValue("check_notecard", FALSE);
-	self->childSetValue("check_object", FALSE);
-	self->childSetValue("check_script", FALSE);
-	self->childSetValue("check_sound", FALSE);
-	self->childSetValue("check_texture", FALSE);
-	self->childSetValue("check_snapshot", FALSE);
-}
-
-
-///----------------------------------------------------------------------------
-/// LLFloaterInventory
-///----------------------------------------------------------------------------
-void LLSaveFolderState::setApply(BOOL apply)
-{
-	mApply = apply; 
-	// before generating new list of open folders, clear the old one
-	if(!apply) 
-	{
-		clearOpenFolders(); 
-	}
-}
-
-void LLSaveFolderState::doFolder(LLFolderViewFolder* folder)
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_DO_FOLDER);
-	if(mApply)
-	{
-		// we're applying the open state
-		LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();
-		if(!bridge) return;
-		LLUUID id(bridge->getUUID());
-		if(mOpenFolders.find(id) != mOpenFolders.end())
-		{
-			folder->setOpen(TRUE);
-		}
-		else
-		{
-			// keep selected filter in its current state, this is less jarring to user
-			if (!folder->isSelected())
-			{
-				folder->setOpen(FALSE);
-			}
-		}
-	}
-	else
-	{
-		// we're recording state at this point
-		if(folder->isOpen())
-		{
-			LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();
-			if(!bridge) return;
-			mOpenFolders.insert(bridge->getUUID());
-		}
-	}
-}
-
-LLFloaterInventory::LLFloaterInventory(const LLSD& key)
-	: LLFloater(key)
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_INIT);
-	// Menu Callbacks (non contex menus)
-	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLFloaterInventory::doToSelected, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.CloseAllFolders", boost::bind(&LLFloaterInventory::closeAllFolders, this));
-	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));
-	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_LOST_AND_FOUND));
-	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLFloaterInventory::doCreate, this, _2));
-// 	mCommitCallbackRegistrar.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::newWindow, this));
-	mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLFloaterInventory::toggleFindOptions, this));
-	mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLFloaterInventory::resetFilters, this));
-	mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLFloaterInventory::setSortBy, this, _2));
-
-	// Controls
-	// *TODO: Just use persistant settings for each of these
-	U32 sort_order = gSavedSettings.getU32("InventorySortOrder");
-	BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );
-	BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );
-	BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );
-	
-	gSavedSettings.declareBOOL("Inventory.SortByName", sort_by_name, "Declared in code", FALSE);
-	gSavedSettings.declareBOOL("Inventory.SortByDate", !sort_by_name, "Declared in code", FALSE);
-	gSavedSettings.declareBOOL("Inventory.FoldersAlwaysByName", sort_folders_by_name, "Declared in code", FALSE);
-	gSavedSettings.declareBOOL("Inventory.SystemFoldersToTop", sort_system_folders_to_top, "Declared in code", FALSE);
-	
-	mSavedFolderState = new LLSaveFolderState();
-	mSavedFolderState->setApply(FALSE);
-
-	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory.xml");
-}
-
-BOOL LLFloaterInventory::postBuild()
-{
-	gInventory.addObserver(this);
-	
-	mFilterTabs = getChild<LLTabContainer>("inventory filter tabs");
-	mFilterTabs->setCommitCallback(boost::bind(&LLFloaterInventory::onFilterSelected, this));
-	
-	//panel->getFilter()->markDefault();
-
-	// Set up the default inv. panel/filter settings.
-	mActivePanel = getChild<LLInventoryPanel>("All Items");
-	if (mActivePanel)
-	{
-		// "All Items" is the previous only view, so it gets the InventorySortOrder
-		mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
-		mActivePanel->getFilter()->markDefault();
-		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
-		mActivePanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mActivePanel, _1, _2));
-	}
-	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
-	if (recent_items_panel)
-	{
-		recent_items_panel->setSinceLogoff(TRUE);
-		recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);
-		recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-		recent_items_panel->getFilter()->markDefault();
-		recent_items_panel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, recent_items_panel, _1, _2));
-	}
-
-	// Now load the stored settings from disk, if available.
-	std::ostringstream filterSaveName;
-	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
-	llinfos << "LLFloaterInventory::init: reading from " << filterSaveName << llendl;
-	llifstream file(filterSaveName.str());
-	LLSD savedFilterState;
-	if (file.is_open())
-	{
-		LLSDSerialize::fromXML(savedFilterState, file);
-		file.close();
-
-		// Load the persistent "Recent Items" settings.
-		// Note that the "All Items" settings do not persist.
-		if(recent_items_panel)
-		{
-			if(savedFilterState.has(recent_items_panel->getFilter()->getName()))
-			{
-				LLSD recent_items = savedFilterState.get(
-					recent_items_panel->getFilter()->getName());
-				recent_items_panel->getFilter()->fromLLSD(recent_items);
-			}
-		}
-
-	}
-
-
-	mFilterEditor = getChild<LLFilterEditor>("inventory search editor");
-	if (mFilterEditor)
-	{
-		mFilterEditor->setCommitCallback(boost::bind(&LLFloaterInventory::onFilterEdit, this, _2));
-	}
-
-	// *TODO:Get the cost info from the server
-	const std::string upload_cost("10");
-	childSetLabelArg("Upload Image", "[COST]", upload_cost);
-	childSetLabelArg("Upload Sound", "[COST]", upload_cost);
-	childSetLabelArg("Upload Animation", "[COST]", upload_cost);
-	childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
-	
-	return TRUE;
-}
-
-// Destroys the object
-LLFloaterInventory::~LLFloaterInventory( void )
-{
-	// Save the filters state.
-	LLSD filterRoot;
-	LLInventoryPanel* all_items_panel = getChild<LLInventoryPanel>("All Items");
-	if (all_items_panel)
-	{
-		LLInventoryFilter* filter = all_items_panel->getFilter();
-		LLSD filterState;
-		filter->toLLSD(filterState);
-		filterRoot[filter->getName()] = filterState;
-	}
-
-	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
-	if (recent_items_panel)
-	{
-		LLInventoryFilter* filter = recent_items_panel->getFilter();
-		LLSD filterState;
-		filter->toLLSD(filterState);
-		filterRoot[filter->getName()] = filterState;
-	}
-
-	std::ostringstream filterSaveName;
-	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
-	llofstream filtersFile(filterSaveName.str());
-	if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))
-	{
-		llwarns << "Could not write to filters save file " << filterSaveName << llendl;
-	}
-	else
-		filtersFile.close();
-
-	gInventory.removeObserver(this);
-	delete mSavedFolderState;
-}
-
-void LLFloaterInventory::draw()
-{
- 	if (LLInventoryModel::isEverythingFetched())
-	{
-		updateTitle();
-	}
-	LLFloater::draw();
-}
-
-void LLOpenFilteredFolders::doItem(LLFolderViewItem *item)
-{
-	if (item->getFiltered())
-	{
-		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-	}
-}
-
-void LLOpenFilteredFolders::doFolder(LLFolderViewFolder* folder)
-{
-	if (folder->getFiltered() && folder->getParentFolder())
-	{
-		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-	}
-	// if this folder didn't pass the filter, and none of its descendants did
-	else if (!folder->getFiltered() && !folder->hasFilteredDescendants())
-	{
-		folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_NO);
-	}
-}
-
-void LLSelectFirstFilteredItem::doItem(LLFolderViewItem *item)
-{
-	if (item->getFiltered() && !mItemSelected)
-	{
-		item->getRoot()->setSelection(item, FALSE, FALSE);
-		if (item->getParentFolder())
-		{
-			item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-		}
-		item->getRoot()->scrollToShowSelection();
-		mItemSelected = TRUE;
-	}
-}
-
-void LLSelectFirstFilteredItem::doFolder(LLFolderViewFolder* folder)
-{
-	if (folder->getFiltered() && !mItemSelected)
-	{
-		folder->getRoot()->setSelection(folder, FALSE, FALSE);
-		if (folder->getParentFolder())
-		{
-			folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-		}
-		folder->getRoot()->scrollToShowSelection();
-		mItemSelected = TRUE;
-	}
-}
-
-void LLOpenFoldersWithSelection::doItem(LLFolderViewItem *item)
-{
-	if (item->getParentFolder() && item->isSelected())
-	{
-		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-	}
-}
-
-void LLOpenFoldersWithSelection::doFolder(LLFolderViewFolder* folder)
-{
-	if (folder->getParentFolder() && folder->isSelected())
-	{
-		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-	}
-}
-
-void LLFloaterInventory::startSearch()
-{
-	// this forces focus to line editor portion of search editor
-	if (mFilterEditor)
-	{
-		mFilterEditor->focusFirstItem(TRUE);
-	}
-}
-
-void LLFloaterInventory::onOpen(const LLSD& key)
-{
-	LLFirstUse::useInventory();
-}
-
-BOOL LLFloaterInventory::handleKeyHere(KEY key, MASK mask)
-{
-	LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : NULL;
-	if (root_folder)
-	{
-		// first check for user accepting current search results
-		if (mFilterEditor 
-			&& mFilterEditor->hasFocus()
-		    && (key == KEY_RETURN 
-		    	|| key == KEY_DOWN)
-		    && mask == MASK_NONE)
-		{
-			// move focus to inventory proper
-			mActivePanel->setFocus(TRUE);
-			root_folder->scrollToShowSelection();
-			return TRUE;
-		}
-
-		if (mActivePanel->hasFocus() && key == KEY_UP)
-		{
-			startSearch();
-		}
-	}
-
-	return LLFloater::handleKeyHere(key, mask);
-
-}
-
-void LLFloaterInventory::updateTitle()
-{
-	LLLocale locale(LLLocale::USER_LOCALE);
-	std::string item_count_string;
-	LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
-
-	LLStringUtil::format_map_t string_args;
-	string_args["[ITEM_COUNT]"] = item_count_string;
-	string_args["[FILTER]"] = mFilterText;
-
-	if (LLInventoryModel::backgroundFetchActive())
-	{
-		setTitle(getString("TitleFetching", string_args));
-	}
-	else
-	{
-		setTitle(getString("TitleCompleted", string_args));
-	}	
-}
-
-
-void LLFloaterInventory::changed(U32 mask)
-{
-	updateTitle();
-}
-
-//----------------------------------------------------------------------------
-// menu callbacks
-
-void LLFloaterInventory::doToSelected(const LLSD& userdata)
-{
-	getPanel()->getRootFolder()->doToSelected(&gInventory, userdata);
-}
-
-void LLFloaterInventory::closeAllFolders()
-{
-	getPanel()->getRootFolder()->closeAllFolders();
-}
-
-void LLFloaterInventory::doCreate(const LLSD& userdata)
-{
-	menu_create_inventory_item(getPanel()->getRootFolder(), NULL, userdata);
-}
-
-void LLFloaterInventory::resetFilters()
-{
-	LLFloaterInventoryFinder *finder = getFinder();
-	getActivePanel()->getFilter()->resetDefault();
-	if (finder)
-	{
-		finder->updateElementsFromFilter();
-	}
-
-	setFilterTextFromFilter();
-}
-
-void LLFloaterInventory::setSortBy(const LLSD& userdata)
-{
-	std::string sort_field = userdata.asString();
-	if (sort_field == "name")
-	{
-		U32 order = getActivePanel()->getSortOrder();
-		getActivePanel()->setSortOrder( order & ~LLInventoryFilter::SO_DATE );
-			
-		gSavedSettings.setBOOL("Inventory.SortByName", TRUE );
-		gSavedSettings.setBOOL("Inventory.SortByDate", FALSE );
-	}
-	else if (sort_field == "date")
-	{
-		U32 order = getActivePanel()->getSortOrder();
-		getActivePanel()->setSortOrder( order | LLInventoryFilter::SO_DATE );
-
-		gSavedSettings.setBOOL("Inventory.SortByName", FALSE );
-		gSavedSettings.setBOOL("Inventory.SortByDate", TRUE );
-	}
-	else if (sort_field == "foldersalwaysbyname")
-	{
-		U32 order = getActivePanel()->getSortOrder();
-		if ( order & LLInventoryFilter::SO_FOLDERS_BY_NAME )
-		{
-			order &= ~LLInventoryFilter::SO_FOLDERS_BY_NAME;
-
-			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", FALSE );
-		}
-		else
-		{
-			order |= LLInventoryFilter::SO_FOLDERS_BY_NAME;
-
-			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", TRUE );
-		}
-		getActivePanel()->setSortOrder( order );
-	}
-	else if (sort_field == "systemfolderstotop")
-	{
-		U32 order = getActivePanel()->getSortOrder();
-		if ( order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP )
-		{
-			order &= ~LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
-
-			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", FALSE );
-		}
-		else
-		{
-			order |= LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
-
-			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", TRUE );
-		}
-		getActivePanel()->setSortOrder( order );
-	}
-}
-
-//----------------------------------------------------------------------------
-
-// static
-LLFloaterInventory* LLFloaterInventory::showAgentInventory()
-{
-	LLFloaterInventory* iv = NULL;
-	if (!gAgent.cameraMouselook())
-	{
-		iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD());
-	}
-	return iv;
-}
-
-// static
-LLFloaterInventory* LLFloaterInventory::getActiveInventory()
-{
-	LLFloaterInventory* res = NULL;
-	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
-	S32 z_min = S32_MAX;
-	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
-	{
-		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter);
-		if (iv)
-		{
-			S32 z_order = gFloaterView->getZOrder(iv);
-			if (z_order < z_min)
-			{
-				res = iv;
-				z_min = z_order;
-			}
-		}
-	}
-	return res;
-}
-
-// static
-void LLFloaterInventory::cleanup()
-{
-	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();)
-	{
-		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter++);
-		if (iv)
-		{
-			iv->destroy();
-		}
-	}
-}
-
-void LLFloaterInventory::toggleFindOptions()
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_TOGGLE);
-	LLFloater *floater = getFinder();
-	if (!floater)
-	{
-		LLFloaterInventoryFinder * finder = new LLFloaterInventoryFinder(this);
-		mFinderHandle = finder->getHandle();
-		finder->openFloater();
-		addDependentFloater(mFinderHandle);
-
-		// start background fetch of folders
-		gInventory.startBackgroundFetch();
-	}
-	else
-	{
-		floater->closeFloater();
-	}
-}
-
-// static
-BOOL LLFloaterInventory::filtersVisible(void* user_data)
-{
-	LLFloaterInventory* self = (LLFloaterInventory*)user_data;
-	if(!self) return FALSE;
-
-	return self->getFinder() != NULL;
-}
-
-void LLFloaterInventory::onClearSearch()
-{
-	LLFloater *finder = getFinder();
-	if (mActivePanel)
-	{
-		mActivePanel->setFilterSubString(LLStringUtil::null);
-		mActivePanel->setFilterTypes(0xffffffff);
-	}
-
-	if (finder)
-	{
-		LLFloaterInventoryFinder::selectAllTypes(finder);
-	}
-
-	// re-open folders that were initially open
-	if (mActivePanel)
-	{
-		mSavedFolderState->setApply(TRUE);
-		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
-		LLOpenFoldersWithSelection opener;
-		mActivePanel->getRootFolder()->applyFunctorRecursively(opener);
-		mActivePanel->getRootFolder()->scrollToShowSelection();
-	}
-}
-
-void LLFloaterInventory::onFilterEdit(const std::string& search_string )
-{
-	if (search_string == "")
-	{
-		onClearSearch();
-	}
-	if (!mActivePanel)
-	{
-		return;
-	}
-
-	gInventory.startBackgroundFetch();
-
-	std::string uppercase_search_string = search_string;
-	LLStringUtil::toUpper(uppercase_search_string);
-	if (mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty())
-	{
-			// current filter and new filter empty, do nothing
-			return;
-	}
-
-	// save current folder open state if no filter currently applied
-	if (!mActivePanel->getRootFolder()->isFilterModified())
-	{
-		mSavedFolderState->setApply(FALSE);
-		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
-	}
-
-	// set new filter string
-	mActivePanel->setFilterSubString(uppercase_search_string);
-}
-
-
- //static
- BOOL LLFloaterInventory::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
- {
- 	LLFloaterInventory* active_view = NULL;
-	
-	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)
-	{
-		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter);
-		if (iv)
-		{
-			if (gFocusMgr.childHasKeyboardFocus(iv))
-			{
-				active_view = iv;
-				break;
-			}
- 		}
- 	}
-
- 	if (!active_view)
- 	{
- 		return FALSE;
- 	}
-
- 	std::string search_string(find_text);
-
- 	if (search_string.empty())
- 	{
- 		return FALSE;
- 	}
-
- 	if (active_view->mActivePanel &&
- 		active_view->mActivePanel->getRootFolder()->search(first_item, search_string, backward))
- 	{
- 		return TRUE;
- 	}
-
- 	return FALSE;
- }
-
-void LLFloaterInventory::onFilterSelected()
-{
-	// Find my index
-	mActivePanel = (LLInventoryPanel*)childGetVisibleTab("inventory filter tabs");
-
-	if (!mActivePanel)
-	{
-		return;
-	}
-	LLInventoryFilter* filter = mActivePanel->getFilter();
-	LLFloaterInventoryFinder *finder = getFinder();
-	if (finder)
-	{
-		finder->changeFilter(filter);
-	}
-	if (filter->isActive())
-	{
-		// If our filter is active we may be the first thing requiring a fetch so we better start it here.
-		gInventory.startBackgroundFetch();
-	}
-	setFilterTextFromFilter();
-}
-
-BOOL LLFloaterInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-										 EDragAndDropType cargo_type,
-										 void* cargo_data,
-										 EAcceptance* accept,
-										 std::string& tooltip_msg)
-{
-	// Check to see if we are auto scrolling from the last frame
-	LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
-	BOOL needsToScroll = panel->getScrollableContainer()->autoScroll(x, y);
-	if(mFilterTabs)
-	{
-		if(needsToScroll)
-		{
-			mFilterTabs->startDragAndDropDelayTimer();
-		}
-	}
-	
-	BOOL handled = LLFloater::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
-
-	return handled;
-}
-const std::string& get_item_icon_name(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point,
-							 BOOL item_is_multi )
-{
-	EInventoryIcon idx = OBJECT_ICON_NAME;
-	if ( item_is_multi )
-	{
-		idx = OBJECT_MULTI_ICON_NAME;
-	}
-	
-	switch(asset_type)
-	{
-	case LLAssetType::AT_TEXTURE:
-		if(LLInventoryType::IT_SNAPSHOT == inventory_type)
-		{
-			idx = SNAPSHOT_ICON_NAME;
-		}
-		else
-		{
-			idx = TEXTURE_ICON_NAME;
-		}
-		break;
-
-	case LLAssetType::AT_SOUND:
-		idx = SOUND_ICON_NAME;
-		break;
-	case LLAssetType::AT_CALLINGCARD:
-		if(attachment_point!= 0)
-		{
-			idx = CALLINGCARD_ONLINE_ICON_NAME;
-		}
-		else
-		{
-			idx = CALLINGCARD_OFFLINE_ICON_NAME;
-		}
-		break;
-	case LLAssetType::AT_LANDMARK:
-		if(attachment_point!= 0)
-		{
-			idx = LANDMARK_VISITED_ICON_NAME;
-		}
-		else
-		{
-			idx = LANDMARK_ICON_NAME;
-		}
-		break;
-	case LLAssetType::AT_SCRIPT:
-	case LLAssetType::AT_LSL_TEXT:
-	case LLAssetType::AT_LSL_BYTECODE:
-		idx = SCRIPT_ICON_NAME;
-		break;
-	case LLAssetType::AT_CLOTHING:
-		idx = CLOTHING_ICON_NAME;
-	case LLAssetType::AT_BODYPART :
-		if(LLAssetType::AT_BODYPART == asset_type)
-		{
-			idx = BODYPART_ICON_NAME;
-		}
-		switch(LLInventoryItem::II_FLAGS_WEARABLES_MASK & attachment_point)
-		{
-		case WT_SHAPE:
-			idx = BODYPART_SHAPE_ICON_NAME;
-			break;
-		case WT_SKIN:
-			idx = BODYPART_SKIN_ICON_NAME;
-			break;
-		case WT_HAIR:
-			idx = BODYPART_HAIR_ICON_NAME;
-			break;
-		case WT_EYES:
-			idx = BODYPART_EYES_ICON_NAME;
-			break;
-		case WT_SHIRT:
-			idx = CLOTHING_SHIRT_ICON_NAME;
-			break;
-		case WT_PANTS:
-			idx = CLOTHING_PANTS_ICON_NAME;
-			break;
-		case WT_SHOES:
-			idx = CLOTHING_SHOES_ICON_NAME;
-			break;
-		case WT_SOCKS:
-			idx = CLOTHING_SOCKS_ICON_NAME;
-			break;
-		case WT_JACKET:
-			idx = CLOTHING_JACKET_ICON_NAME;
-			break;
-		case WT_GLOVES:
-			idx = CLOTHING_GLOVES_ICON_NAME;
-			break;
-		case WT_UNDERSHIRT:
-			idx = CLOTHING_UNDERSHIRT_ICON_NAME;
-			break;
-		case WT_UNDERPANTS:
-			idx = CLOTHING_UNDERPANTS_ICON_NAME;
-			break;
-		case WT_SKIRT:
-			idx = CLOTHING_SKIRT_ICON_NAME;
-			break;
-		case WT_ALPHA:
-			idx = CLOTHING_ALPHA_ICON_NAME;
-			break;
-		case WT_TATTOO:
-			idx = CLOTHING_TATTOO_ICON_NAME;
-			break;
-		default:
-			// no-op, go with choice above
-			break;
-		}
-		break;
-	case LLAssetType::AT_NOTECARD:
-		idx = NOTECARD_ICON_NAME;
-		break;
-	case LLAssetType::AT_ANIMATION:
-		idx = ANIMATION_ICON_NAME;
-		break;
-	case LLAssetType::AT_GESTURE:
-		idx = GESTURE_ICON_NAME;
-		break;
-	case LLAssetType::AT_FAVORITE:
-		//TODO - need bette idx
-		idx = LANDMARK_ICON_NAME;
-		break;
-	case LLAssetType::AT_LINK:
-		idx = LINKITEM_ICON_NAME;
-		break;
-	case LLAssetType::AT_LINK_FOLDER:
-		idx = LINKFOLDER_ICON_NAME;
-		break;
-	default:
-		break;
-	}
-	
-	return ICON_NAME[idx];
-}
-
-LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point,
-							 BOOL item_is_multi)
-{
-	const std::string& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
-	return LLUI::getUIImage(icon_name);
-}
-
-const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder");
-const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("RecentItemsSortOrder");
-const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");
-static const LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER;
-
-LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p)
-:	LLPanel(p),
-	mInventoryObserver(NULL),
-	mFolders(NULL),
-	mScroller(NULL),
-	mSortOrderSetting(p.sort_order_setting),
-	mInventory(p.inventory),
-	mAllowMultiSelect(p.allow_multi_select),
-	mHasInventoryConnection(false),
-	mStartFolderString(p.start_folder)
-,	mBuildDefaultHierarchy(true)
-,	mInvFVBridgeBuilder(NULL)
-{
-	mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
-
-	// contex menu callbacks
-	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryPanel::doToSelected, this, _2));
-	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));
-	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_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));
-	
-	setBackgroundColor(LLUIColorTable::instance().getColor("InventoryBackgroundColor"));
-	setBackgroundVisible(TRUE);
-	setBackgroundOpaque(TRUE);
-}
-
-BOOL LLInventoryPanel::postBuild()
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_POST_BUILD);
-
-	mCommitCallbackRegistrar.pushScope(); // registered as a widget; need to push callback scope ourselves
-	
-	// create root folder
-	{
-		LLRect folder_rect(0,
-						   0,
-						   getRect().getWidth(),
-						   0);
-		LLFolderView::Params p;
-		p.name = getName();
-		p.rect = folder_rect;
-		p.parent_panel = this;
-		mFolders = LLUICtrlFactory::create<LLFolderView>(p);
-		mFolders->setAllowMultiSelect(mAllowMultiSelect);
-	}
-
-	mCommitCallbackRegistrar.popScope();
-	
-	mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar);
-	
-	// scroller
-	{
-		LLRect scroller_view_rect = getRect();
-		scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
-		LLScrollContainer::Params p;
-		p.name("Inventory Scroller");
-		p.rect(scroller_view_rect);
-		p.follows.flags(FOLLOWS_ALL);
-		p.reserve_scroll_corner(true);
-		p.tab_stop(true);
-		mScroller = LLUICtrlFactory::create<LLScrollContainer>(p);
-	}
-	addChild(mScroller);
-	mScroller->addChild(mFolders);
-	
-	mFolders->setScrollContainer(mScroller);
-
-	// set up the callbacks from the inventory we're viewing, and then
-	// build everything.
-	mInventoryObserver = new LLInventoryPanelObserver(this);
-	mInventory->addObserver(mInventoryObserver);
-
-	// determine the root folder, if any, so inventory contents show just the children
-	// of that folder (i.e. not including the folder itself).
-	const LLAssetType::EType preferred_type = LLAssetType::lookupHumanReadable(mStartFolderString);
-
-	if ("inventory" == mStartFolderString)
-	{
-		mStartFolderID = gInventory.getRootFolderID();
-	}
-	else if ("library" == mStartFolderString)
-	{
-		mStartFolderID = gInventory.getLibraryRootFolderID();
-	}
-	else
-	{
-		mStartFolderID = (preferred_type != LLAssetType::AT_NONE ? gInventory.findCategoryUUIDForType(preferred_type) : LLUUID::null);
-	}
-
-	// build view of inventory if we need default full hierarchy and inventory ready, otherwise wait for modelChanged() callback
-	if (mBuildDefaultHierarchy && mInventory->isInventoryUsable() && !mHasInventoryConnection)
-	{
-		rebuildViewsFor(mStartFolderID);
-		mHasInventoryConnection = true;
-	}
-
-	// bit of a hack to make sure the inventory is open.
-	mFolders->openFolder(preferred_type != LLAssetType::AT_NONE ? LLAssetType::lookupCategoryName(preferred_type) : "My Inventory");
-
-	if (mSortOrderSetting != INHERIT_SORT_ORDER)
-	{
-		setSortOrder(gSavedSettings.getU32(mSortOrderSetting));
-	}
-	else
-	{
-		setSortOrder(gSavedSettings.getU32(DEFAULT_SORT_ORDER));
-	}
-	mFolders->setSortOrder(mFolders->getFilter()->getSortOrder());
-
-	return TRUE;
-}
-
-LLInventoryPanel::~LLInventoryPanel()
-{
-	// should this be a global setting?
-	if (mFolders)
-	{
-		U32 sort_order = mFolders->getSortOrder();
-		if (mSortOrderSetting != INHERIT_SORT_ORDER)
-		{
-			gSavedSettings.setU32(mSortOrderSetting, sort_order);
-		}
-	}
-
-	// LLView destructor will take care of the sub-views.
-	mInventory->removeObserver(mInventoryObserver);
-	delete mInventoryObserver;
-	mScroller = NULL;
-}
-
-LLMemType mt(LLMemType::MTYPE_INVENTORY_FROM_XML); // ! BUG ! Should this be removed?
-void LLInventoryPanel::draw()
-{
-	// select the desired item (in case it wasn't loaded when the selection was requested)
-	mFolders->updateSelection();
-	LLPanel::draw();
-}
-
-void LLInventoryPanel::setFilterTypes(U64 filter_types, BOOL filter_for_categories)
-{
-	mFolders->getFilter()->setFilterTypes(filter_types, filter_for_categories);
-}	
-
-void LLInventoryPanel::setFilterPermMask(PermissionMask filter_perm_mask)
-{
-	mFolders->getFilter()->setFilterPermissions(filter_perm_mask);
-}
-
-void LLInventoryPanel::setFilterSubString(const std::string& string)
-{
-	mFolders->getFilter()->setFilterSubString(string);
-}
-
-void LLInventoryPanel::setSortOrder(U32 order)
-{
-	mFolders->getFilter()->setSortOrder(order);
-	if (mFolders->getFilter()->isModified())
-	{
-		mFolders->setSortOrder(order);
-		// try to keep selection onscreen, even if it wasn't to start with
-		mFolders->scrollToShowSelection();
-	}
-}
-
-void LLInventoryPanel::setSinceLogoff(BOOL sl)
-{
-	mFolders->getFilter()->setDateRangeLastLogoff(sl);
-}
-
-void LLInventoryPanel::setHoursAgo(U32 hours)
-{
-	mFolders->getFilter()->setHoursAgo(hours);
-}
-
-void LLInventoryPanel::setShowFolderState(LLInventoryFilter::EFolderShow show)
-{
-	mFolders->getFilter()->setShowFolderState(show);
-}
-
-LLInventoryFilter::EFolderShow LLInventoryPanel::getShowFolderState()
-{
-	return mFolders->getFilter()->getShowFolderState();
-}
-
-static LLFastTimer::DeclareTimer FTM_REFRESH("Inventory Refresh");
-
-void LLInventoryPanel::modelChanged(U32 mask)
-{
-	LLFastTimer t2(FTM_REFRESH);
-
-	bool handled = false;
-
-	// inventory just initialized, do complete build
-	if ((mask & LLInventoryObserver::ADD) && gInventory.getChangedIDs().empty() && !mHasInventoryConnection)
-	{
-		rebuildViewsFor(mStartFolderID);
-		mHasInventoryConnection = true;
-		return;
-	}
-
-	if(mask & LLInventoryObserver::LABEL)
-	{
-		handled = true;
-		// label change - empty out the display name for each object
-		// in this change set.
-		const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
-		std::set<LLUUID>::const_iterator id_it = changed_items.begin();
-		std::set<LLUUID>::const_iterator id_end = changed_items.end();
-		LLFolderViewItem* view = NULL;
-		LLInvFVBridge* bridge = NULL;
-		for (;id_it != id_end; ++id_it)
-		{
-			view = mFolders->getItemByID(*id_it);
-			if(view)
-			{
-				// request refresh on this item (also flags for filtering)
-				bridge = (LLInvFVBridge*)view->getListener();
-				if(bridge)
-				{	// Clear the display name first, so it gets properly re-built during refresh()
-					bridge->clearDisplayName();
-				}
-				view->refresh();
-			}
-		}
-	}
-	if((mask & (LLInventoryObserver::STRUCTURE
-				| LLInventoryObserver::ADD
-				| LLInventoryObserver::REMOVE)) != 0)
-	{
-		handled = true;
-		// Record which folders are open by uuid.
-		LLInventoryModel* model = getModel();
-		if (model)
-		{
-			const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
-
-			std::set<LLUUID>::const_iterator id_it = changed_items.begin();
-			std::set<LLUUID>::const_iterator id_end = changed_items.end();
-			for (;id_it != id_end; ++id_it)
-			{
-				// sync view with model
-				LLInventoryObject* model_item = model->getObject(*id_it);
-				LLFolderViewItem* view_item = mFolders->getItemByID(*id_it);
-
-				if (model_item)
-				{
-					if (!view_item)
-					{
-						// this object was just created, need to build a view for it
-						if ((mask & LLInventoryObserver::ADD) != LLInventoryObserver::ADD)
-						{
-							llwarns << *id_it << " is in model but not in view, but ADD flag not set" << llendl;
-						}
-						buildNewViews(*id_it);
-						
-						// select any newly created object
-						// that has the auto rename at top of folder
-						// root set
-						if(mFolders->getRoot()->needsAutoRename())
-						{
-							setSelection(*id_it, FALSE);
-						}
-					}
-					else
-					{
-						// this object was probably moved, check its parent
-						if ((mask & LLInventoryObserver::STRUCTURE) != LLInventoryObserver::STRUCTURE)
-						{
-							llwarns << *id_it << " is in model and in view, but STRUCTURE flag not set" << llendl;
-						}
-
-						LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolders->getItemByID(model_item->getParentUUID());
-
-						// added check against NULL for cases when Inventory panel contains startFolder.
-						// in this case parent is LLFolderView (LLInventoryPanel::mFolders) itself.
-						// this check is a fix for bug EXT-1859.
-						if (NULL != new_parent && view_item->getParentFolder() != new_parent)
-						{
-							view_item->getParentFolder()->extractItem(view_item);
-							view_item->addToFolder(new_parent, mFolders);
-						}
-					}
-				}
-				else
-				{
-					if (view_item)
-					{
-						if ((mask & LLInventoryObserver::REMOVE) != LLInventoryObserver::REMOVE)
-						{
-							llwarns << *id_it << " is not in model but in view, but REMOVE flag not set" << llendl;
-						}
-						// item in view but not model, need to delete view
-						view_item->destroyView();
-					}
-					else
-					{
-						llwarns << *id_it << "Item does not exist in either view or model, but notification triggered" << llendl;
-					}
-				}
-			}
-		}
-	}
-
-	if (!handled)
-	{
-		// it's a small change that only requires a refresh.
-		// *TODO: figure out a more efficient way to do the refresh
-		// since it is expensive on large inventories
-		mFolders->refresh();
-	}
-}
-
-
-void LLInventoryPanel::rebuildViewsFor(const LLUUID& id)
-{
-	LLFolderViewItem* old_view = NULL;
-
-	// get old LLFolderViewItem
-	old_view = mFolders->getItemByID(id);
-	if (old_view && id.notNull())
-	{
-		old_view->destroyView();
-	}
-
-	buildNewViews(id);
-}
-
-void LLInventoryPanel::buildNewViews(const LLUUID& id)
-{
-	LLMemType mt(LLMemType::MTYPE_INVENTORY_BUILD_NEW_VIEWS);
-	LLFolderViewItem* itemp = NULL;
-	LLInventoryObject* objectp = NULL;
-
-	// Don't add the start folder (the inventory panel will show contents
-	// beginning with the children of the starting folder, excluding the starting folder itself).
-	if (id != mStartFolderID)
-	{
-		objectp = gInventory.getObject(id);
-		if (objectp)
-		{		
-			const LLUUID &parent_id = objectp->getParentUUID();
-			// If this item's parent is the starting folder, then just add it to the top level (recall that 
-			// the starting folder isn't actually represented in the view, parent_folder would be NULL in
-			// this case otherwise).
-			LLFolderViewFolder* parent_folder = (parent_id == mStartFolderID ?
-				mFolders : (LLFolderViewFolder*)mFolders->getItemByID(parent_id));
-
-			// This item exists outside the inventory's hierarchy, so don't add it.
-			if (!parent_folder)
-			{
-				return;
-			}
-
-			if (objectp->getType() <= LLAssetType::AT_NONE ||
-				objectp->getType() >= LLAssetType::AT_COUNT)
-			{
-				llwarns << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : " << 
-					((S32) objectp->getType()) << 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,
-																				objectp->getUUID());
-
-				if (new_listener)
-				{
-					LLFolderViewFolder::Params p;
-					p.name = new_listener->getDisplayName();
-					p.icon = new_listener->getIcon();
-					p.root = mFolders;
-					p.listener = new_listener;
-					LLFolderViewFolder* folderp = LLUICtrlFactory::create<LLFolderViewFolder>(p);
-				
-					folderp->setItemSortOrder(mFolders->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,
-																				item->getUUID(),
-																				item->getFlags());
-
-				if (new_listener)
-				{
-					LLFolderViewItem::Params params;
-					params.name(new_listener->getDisplayName());
-					params.icon(new_listener->getIcon());
-					params.creation_date(new_listener->getCreationDate());
-					params.root(mFolders);
-					params.listener(new_listener);
-					params.rect(LLRect (0, 0, 0, 0));
-					itemp = LLUICtrlFactory::create<LLFolderViewItem> (params);
-				}
-			}
-
-			if (itemp)
-			{
-				itemp->addToFolder(parent_folder, mFolders);
-			}
-		}
-	}
-
-	// If this is a folder, add the children of the folder and recursively add any 
-	// child folders.
-	if ((id == mStartFolderID) ||
-		(objectp && objectp->getType() == LLAssetType::AT_CATEGORY))
-	{
-		LLViewerInventoryCategory::cat_array_t* categories;
-		LLViewerInventoryItem::item_array_t* items;
-
-		mInventory->lockDirectDescendentArrays(id, categories, items);
-		if(categories)
-		{
-			S32 count = categories->count();
-			for(S32 i = 0; i < count; ++i)
-			{
-				LLInventoryCategory* cat = categories->get(i);
-				buildNewViews(cat->getUUID());
-			}
-		}
-		if(items)
-		{
-			S32 count = items->count();
-			for(S32 i = 0; i < count; ++i)
-			{
-				LLInventoryItem* item = items->get(i);
-				buildNewViews(item->getUUID());
-			}
-		}
-		mInventory->unlockDirectDescendentArrays(id);
-	}
-}
-
-struct LLConfirmPurgeData
-{
-	LLUUID mID;
-	LLInventoryModel* mModel;
-};
-
-class LLIsNotWorn : public LLInventoryCollectFunctor
-{
-public:
-	LLIsNotWorn() {}
-	virtual ~LLIsNotWorn() {}
-	virtual bool operator()(LLInventoryCategory* cat,
-							LLInventoryItem* item)
-	{
-		return !gAgentWearables.isWearingItem(item->getUUID());
-	}
-};
-
-class LLOpenFolderByID : public LLFolderViewFunctor
-{
-public:
-	LLOpenFolderByID(const LLUUID& id) : mID(id) {}
-	virtual ~LLOpenFolderByID() {}
-	virtual void doFolder(LLFolderViewFolder* folder)
-		{
-			if (folder->getListener() && folder->getListener()->getUUID() == mID) folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
-		}
-	virtual void doItem(LLFolderViewItem* item) {}
-protected:
-	const LLUUID& mID;
-};
-
-
-void LLInventoryPanel::openSelected()
-{
-	LLFolderViewItem* folder_item = mFolders->getCurSelectedItem();
-	if(!folder_item) return;
-	LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getListener();
-	if(!bridge) return;
-	bridge->openItem();
-}
-
-BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = LLView::handleHover(x, y, mask);
-	if(handled)
-	{
-		ECursorType cursor = getWindow()->getCursor();
-		if (LLInventoryModel::backgroundFetchActive() && 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::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg)
-{
-
-	BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
-
-	if (handled)
-	{
-		mFolders->setDragAndDropThisFrame();
-	}
-
-	return handled;
-}
-
-void LLInventoryPanel::onFocusLost()
-{
-	// inventory no longer handles cut/copy/paste/delete
-	if (LLEditMenuHandler::gEditMenuHandler == mFolders)
-	{
-		LLEditMenuHandler::gEditMenuHandler = NULL;
-	}
-
-	LLPanel::onFocusLost();
-}
-
-void LLInventoryPanel::onFocusReceived()
-{
-	// inventory now handles cut/copy/paste/delete
-	LLEditMenuHandler::gEditMenuHandler = mFolders;
-
-	LLPanel::onFocusReceived();
-}
-
-
-void LLInventoryPanel::openAllFolders()
-{
-	mFolders->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
-	mFolders->arrangeAll();
-}
-
-void LLInventoryPanel::openDefaultFolderForType(LLAssetType::EType type)
-{
-	LLUUID category_id = mInventory->findCategoryUUIDForType(type);
-	LLOpenFolderByID opener(category_id);
-	mFolders->applyFunctorRecursively(opener);
-}
-
-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 = gInventory.getObject(obj_id);
-	if (obj && obj->getParentUUID() == LLAppearanceManager::getCOF())
-	{
-		return;
-	}
-	mFolders->setSelectionByID(obj_id, take_keyboard_focus);
-}
-
-void LLInventoryPanel::clearSelection()
-{
-	mFolders->clearSelection();
-}
-
-void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
-{
-	LLFolderView* fv = getRootFolder();
-	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();
-		}
-	}
-	// Seraph - Put determineFolderType in here for ensemble typing?
-}
-
-//----------------------------------------------------------------------------
-
-void LLInventoryPanel::doToSelected(const LLSD& userdata)
-{
-	mFolders->doToSelected(&gInventory, userdata);
-}
-
-void LLInventoryPanel::doCreate(const LLSD& userdata)
-{
-	menu_create_inventory_item(mFolders, LLFolderBridge::sSelf, userdata);
-}
-
-bool LLInventoryPanel::beginIMSession()
-{
-	std::set<LLUUID> selected_items;
-	mFolders->getSelectionList(selected_items);
-
-	std::string name;
-	static int session_num = 1;
-
-	LLDynamicArray<LLUUID> members;
-	EInstantMessage type = IM_SESSION_CONFERENCE_START;
-
-	std::set<LLUUID>::const_iterator iter;
-	for (iter = selected_items.begin(); iter != selected_items.end(); iter++)
-	{
-
-		LLUUID item = *iter;
-		LLFolderViewItem* folder_item = mFolders->getItemByID(item);
-			
-		if(folder_item) 
-		{
-			LLFolderViewEventListener* fve_listener = folder_item->getListener();
-			if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
-			{
-
-				LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getListener();
-				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.count();
-				if(count > 0)
-				{
-					LLFloaterReg::showInstance("communicate");
-					// create the session
-					LLAvatarTracker& at = LLAvatarTracker::instance();
-					LLUUID id;
-					for(S32 i = 0; i < count; ++i)
-					{
-						id = item_array.get(i)->getCreatorUUID();
-						if(at.isBuddyOnline(id))
-						{
-							members.put(id);
-						}
-					}
-				}
-			}
-			else
-			{
-				LLFolderViewItem* folder_item = mFolders->getItemByID(item);
-				if(!folder_item) return true;
-				LLInvFVBridge* listenerp = (LLInvFVBridge*)folder_item->getListener();
-
-				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.put(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 = llformat("Session %d", session_num++);
-	}
-
-	gIMMgr->addSession(name, type, members[0], members);
-		
-	return true;
-}
-
-bool LLInventoryPanel::attachObject(const LLSD& userdata)
-{
-	std::set<LLUUID> selected_items;
-	mFolders->getSelectionList(selected_items);
-
-	std::string joint_name = userdata.asString();
-	LLVOAvatar *avatarp = static_cast<LLVOAvatar*>(gAgent.getAvatarObject());
-	LLViewerJointAttachment* attachmentp = NULL;
-	for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
-		 iter != avatarp->mAttachmentPoints.end(); )
-	{
-		LLVOAvatar::attachment_map_t::iterator curiter = iter++;
-		LLViewerJointAttachment* attachment = curiter->second;
-		if (attachment->getName() == joint_name)
-		{
-			attachmentp = attachment;
-			break;
-		}
-	}
-	if (attachmentp == NULL)
-	{
-		return true;
-	}
-
-	for (std::set<LLUUID>::const_iterator set_iter = selected_items.begin(); 
-		 set_iter != selected_items.end(); 
-		 ++set_iter)
-	{
-		const LLUUID &id = *set_iter;
-		LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem(id);
-		if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID()))
-		{
-			rez_attachment(item, attachmentp);
-		}
-		else if(item && item->isComplete())
-		{
-			// must be in library. copy it to our inventory and put it on.
-			LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(attachmentp);
-			copy_inventory_item(gAgent.getID(),
-								item->getPermissions().getOwner(),
-								item->getUUID(),
-								LLUUID::null,
-								std::string(),
-								cb);
-		}
-	}
-	gFocusMgr.setKeyboardFocus(NULL);
-
-	return true;
-}
-
-
-//----------------------------------------------------------------------------
-
-// static DEBUG ONLY:
-void LLInventoryPanel::dumpSelectionInformation(void* user_data)
-{
-	LLInventoryPanel* iv = (LLInventoryPanel*)user_data;
-	iv->mFolders->dumpSelectionInformation();
-}
-
-BOOL LLInventoryPanel::getSinceLogoff()
-{
-	return mFolders->getFilter()->isSinceLogoff();
-}
-
-void example_param_block_usage()
-{
-	LLInventoryPanel::Params param_block;
-	param_block.name(std::string("inventory"));
-
-	param_block.sort_order_setting(LLInventoryPanel::RECENTITEMS_SORT_ORDER);
-	param_block.allow_multi_select(true);
-	param_block.filter(LLInventoryPanel::Filter()
-			.sort_order(1)
-			.types(0xffff0000));
-	param_block.inventory(&gInventory);
-	param_block.has_border(true);
-
-	LLUICtrlFactory::create<LLInventoryPanel>(param_block);
-
-	param_block = LLInventoryPanel::Params();
-	param_block.name(std::string("inventory"));
-
-	//LLSD param_block_sd;
-	//param_block_sd["sort_order_setting"] = LLInventoryPanel::RECENTITEMS_SORT_ORDER;
-	//param_block_sd["allow_multi_select"] = true;
-	//param_block_sd["filter"]["sort_order"] = 1;
-	//param_block_sd["filter"]["types"] = (S32)0xffff0000;
-	//param_block_sd["has_border"] = true;
-
-	//LLInitParam::LLSDParser(param_block_sd).parse(param_block);
-
-	LLUICtrlFactory::create<LLInventoryPanel>(param_block);
-}
+/** 

+ * @file llfloaterinventory.cpp

+ * @brief Implementation of the inventory view and associated stuff.

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterinventory.h"

+

+#include "llagent.h"

+#include "llfirstuse.h"

+#include "llfloaterreg.h"

+#include "llinventorymodel.h"

+#include "llpanelmaininventory.h"

+#include "llresmgr.h"

+

+///----------------------------------------------------------------------------

+/// LLFloaterInventory

+///----------------------------------------------------------------------------

+

+LLFloaterInventory::LLFloaterInventory(const LLSD& key)

+	: LLFloater(key)

+{

+}

+

+LLFloaterInventory::~LLFloaterInventory()

+{

+}

+

+BOOL LLFloaterInventory::postBuild()

+{

+	mPanelMainInventory = getChild<LLPanelMainInventory>("Inventory Panel");

+	return TRUE;

+}

+

+

+void LLFloaterInventory::draw()

+{

+ 	if (LLInventoryModel::isEverythingFetched())

+	{

+		updateTitle();

+	}

+	LLFloater::draw();

+}

+

+void LLFloaterInventory::updateTitle()

+{

+	LLLocale locale(LLLocale::USER_LOCALE);

+	std::string item_count_string;

+	LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());

+

+	LLStringUtil::format_map_t string_args;

+	string_args["[ITEM_COUNT]"] = item_count_string;

+	string_args["[FILTER]"] = mPanelMainInventory->getFilterText();

+

+	if (LLInventoryModel::backgroundFetchActive())

+	{

+		setTitle(getString("TitleFetching", string_args));

+	}

+	else

+	{

+		setTitle(getString("TitleCompleted", string_args));

+	}

+}

+

+void LLFloaterInventory::changed(U32 mask)

+{

+	updateTitle();

+}

+

+LLInventoryPanel* LLFloaterInventory::getPanel()

+{

+	if (mPanelMainInventory)

+		return mPanelMainInventory->getPanel();

+	return NULL;

+}

+

+// static

+LLFloaterInventory* LLFloaterInventory::showAgentInventory()

+{

+	LLFloaterInventory* iv = NULL;

+	if (!gAgent.cameraMouselook())

+	{

+		iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD());

+	}

+	return iv;

+}

+

+// static

+LLFloaterInventory* LLFloaterInventory::getActiveInventory()

+{

+	LLFloaterInventory* res = NULL;

+	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");

+	S32 z_min = S32_MAX;

+	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)

+	{

+		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter);

+		if (iv)

+		{

+			S32 z_order = gFloaterView->getZOrder(iv);

+			if (z_order < z_min)

+			{

+				res = iv;

+				z_min = z_order;

+			}

+		}

+	}

+	return res;

+}

+

+// static

+void LLFloaterInventory::cleanup()

+{

+	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();)

+	{

+		LLFloaterInventory* iv = dynamic_cast<LLFloaterInventory*>(*iter++);

+		if (iv)

+		{

+			iv->destroy();

+		}

+	}

+}

+

+void LLFloaterInventory::onOpen(const LLSD& key)

+{

+	LLFirstUse::useInventory();

+}

diff --git a/indra/newview/llfloaterinventory.h b/indra/newview/llfloaterinventory.h
index 4c9ac5d4c6..f2f2963a33 100644
--- a/indra/newview/llfloaterinventory.h
+++ b/indra/newview/llfloaterinventory.h
@@ -31,366 +31,54 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLINVENTORYVIEW_H
-#define LL_LLINVENTORYVIEW_H
+#ifndef LL_LLFLOATERINVENTORY_H
+#define LL_LLFLOATERINVENTORY_H
 
-#include "llassetstorage.h"
-#include "lldarray.h"
 #include "llfloater.h"
-#include "llinventory.h"
-#include "llinventoryfilter.h"
-#include "llfolderview.h"
-#include "llinventorymodel.h"
-#include "lluictrlfactory.h"
-#include <set>
 
+class LLInventoryPanel;
+class LLPanelMainInventory;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLFloaterInventory
 //
-// This is the agent inventory _floater_.
-// It deals with the buttons and views used to navigate as
-// well as controls the behavior of the overall object.
+// This deals with the buttons and views used to navigate as
+// well as controlling the behavior of the overall object.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLFolderViewItem;
-class LLInventoryFilter;
-class LLInventoryModel;
-class LLInvFVBridge;
-class LLInventoryFVBridgeBuilder;
-class LLMenuBarGL;
-class LLCheckBoxCtrl;
-class LLSpinCtrl;
-class LLScrollContainer;
-class LLTextBox;
-class LLIconCtrl;
-class LLSaveFolderState;
-class LLFilterEditor;
-class LLTabContainer;
-
-class LLInventoryPanel : public LLPanel
+class LLFloaterInventory : public LLFloater
 {
 public:
-	static const std::string DEFAULT_SORT_ORDER;
-	static const std::string RECENTITEMS_SORT_ORDER;
-	static const std::string INHERIT_SORT_ORDER;
-
-	struct Filter : public LLInitParam::Block<Filter>
-	{
-		Optional<U32>			sort_order;
-		Optional<U32>			types;
-		Optional<std::string>	search_string;
-
-		Filter()
-		:	sort_order("sort_order"),
-			types("types", 0xffffffff),
-			search_string("search_string")
-		{}
-	};
-
-	struct Params 
-	:	public LLInitParam::Block<Params, LLPanel::Params>
-	{
-		Optional<std::string>				sort_order_setting;
-		Optional<LLInventoryModel*>			inventory;
-		Optional<bool>						allow_multi_select;
-		Optional<Filter>					filter;
-		Optional<std::string>               start_folder;
-
-		Params()
-		:	sort_order_setting("sort_order_setting"),
-			inventory("", &gInventory),
-			allow_multi_select("allow_multi_select", true),
-			filter("filter"),
-			start_folder("start_folder")
-		{}
-	};
-
-protected:
-	LLInventoryPanel(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	virtual ~LLInventoryPanel();
-
-	LLInventoryModel* getModel() { return mInventory; }
-
-	BOOL postBuild();
-
-	// LLView methods
-	void draw();
-	BOOL handleHover(S32 x, S32 y, MASK mask);
-	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg);
-	// LLUICtrl methods
-	 /*virtual*/ void onFocusLost();
-	 /*virtual*/ void onFocusReceived();
-
-	// Call this method to set the selection.
-	void openAllFolders();
-	void openDefaultFolderForType(LLAssetType::EType);
-	void setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus);
-	void setSelectCallback(const LLFolderView::signal_t::slot_type& cb) { if (mFolders) mFolders->setSelectCallback(cb); }
-	void clearSelection();
-	LLInventoryFilter* getFilter() { return mFolders->getFilter(); }
-	void setFilterTypes(U64 filter, BOOL filter_for_categories = FALSE); // if filter_for_categories is true, operate on folder preferred asset type
-	U32 getFilterTypes() const { return mFolders->getFilterTypes(); }
-	void setFilterPermMask(PermissionMask filter_perm_mask);
-	U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
-	void setFilterSubString(const std::string& string);
-	const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
-	void setSortOrder(U32 order);
-	U32 getSortOrder() { return mFolders->getSortOrder(); }
-	void setSinceLogoff(BOOL sl);
-	void setHoursAgo(U32 hours);
-	BOOL getSinceLogoff();
-	
-	void setShowFolderState(LLInventoryFilter::EFolderShow show);
-	LLInventoryFilter::EFolderShow getShowFolderState();
-	void setAllowMultiSelect(BOOL allow) { mFolders->setAllowMultiSelect(allow); }
-	// This method is called when something has changed about the inventory.
-	void modelChanged(U32 mask);
-	LLFolderView* getRootFolder() { return mFolders; }
-	LLScrollContainer* getScrollableContainer() { return mScroller; }
-	
-	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
-	
-	// Callbacks
-	void doToSelected(const LLSD& userdata);
-	void doCreate(const LLSD& userdata);
-	bool beginIMSession();
-	bool attachObject(const LLSD& userdata);
-	
-	// DEBUG ONLY:
-	static void dumpSelectionInformation(void* user_data);
-
-	void openSelected();
-	void unSelectAll()	{ mFolders->setSelection(NULL, FALSE, FALSE); }
-	
-protected:
-	// Given the id and the parent, build all of the folder views.
-	void rebuildViewsFor(const LLUUID& id);
-	virtual void buildNewViews(const LLUUID& id); // made virtual to support derived classes. EXT-719
-
-protected:
-	LLInventoryModel*			mInventory;
-	LLInventoryObserver*		mInventoryObserver;
-	BOOL 						mAllowMultiSelect;
-	std::string					mSortOrderSetting;
-
-//private: // Can not make these private - needed by llinventorysubtreepanel
-	LLFolderView*				mFolders;
-	std::string                 mStartFolderString;
-
-	/**
-	 * Contains UUID of Inventory item from which hierarchy should be built.
-	 * Can be set with the "start_folder" xml property.
-	 * Default is LLUUID::null that means total Inventory hierarchy.
-	 */
-	LLUUID						mStartFolderID;
-	LLScrollContainer*			mScroller;
-	bool						mHasInventoryConnection;
-
-	/**
-	 * Flag specified if default inventory hierarchy should be created in postBuild()
-	 */
-	bool						mBuildDefaultHierarchy;
-
-	LLUUID						mRootInventoryItemUUID;
-
-	/**
-	 * Pointer to LLInventoryFVBridgeBuilder.
-	 *
-	 * It is set in LLInventoryPanel's constructor and can be overridden in derived classes with 
-	 * another implementation.
-	 * Take into account it will not be deleted by LLInventoryPanel itself.
-	 */
-	const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder;
-
-};
-
-class LLFloaterInventory;
-
-class LLFloaterInventoryFinder : public LLFloater
-{
-public:
-	LLFloaterInventoryFinder( LLFloaterInventory* inventory_view);
-	virtual void draw();
-	/*virtual*/	BOOL	postBuild();
-	void changeFilter(LLInventoryFilter* filter);
-	void updateElementsFromFilter();
-	BOOL getCheckShowEmpty();
-	BOOL getCheckSinceLogoff();
-
-	static void onTimeAgo(LLUICtrl*, void *);
-	static void onCheckSinceLogoff(LLUICtrl*, void *);
-	static void onCloseBtn(void* user_data);
-	static void selectAllTypes(void* user_data);
-	static void selectNoTypes(void* user_data);
-
-protected:
-	LLFloaterInventory*	mFloaterInventory;
-	LLSpinCtrl*			mSpinSinceDays;
-	LLSpinCtrl*			mSpinSinceHours;
-	LLInventoryFilter*	mFilter;
-};
-
-class LLFloaterInventory : public LLFloater, LLInventoryObserver
-{
-friend class LLFloaterInventoryFinder;
-
-public:
 	LLFloaterInventory(const LLSD& key);
 	~LLFloaterInventory();
 
-	/*virtual*/ void changed(U32 mask);
-
-	 BOOL postBuild();
-
-	//
-	// Misc functions
-	//
-	void setFilterTextFromFilter() { mFilterText = mActivePanel->getFilter()->getFilterText(); }
-	void startSearch();
-	
-	// This method makes sure that an inventory view exists, is
-	// visible, and has focus. The view chosen is returned.
-	static LLFloaterInventory* showAgentInventory();
+	BOOL postBuild();
 
 	// Return the active inventory view if there is one. Active is
 	// defined as the inventory that is the closest to the front, and
 	// is visible.
 	static LLFloaterInventory* getActiveInventory();
 
-	// This method calls showAgentInventory() if no views are visible,
-	// or hides/destroyes them all if any are visible.
-	static void toggleVisibility();
-	static void toggleVisibility(void*) { toggleVisibility(); }
+	// This method makes sure that an inventory view exists, is
+	// visible, and has focus. The view chosen is returned.
+	static LLFloaterInventory* showAgentInventory();
 
 	// Final cleanup, destroy all open inventory views.
 	static void cleanup();
 
-	// LLView & LLFloater functionality
-	virtual void onOpen(const LLSD& key);
-	virtual void draw();
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
-
-	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-		EDragAndDropType cargo_type,
-		void* cargo_data,
-		EAcceptance* accept,
-		std::string& tooltip_msg);
-
-
-	LLInventoryPanel* getPanel() { return mActivePanel; }
-	LLInventoryPanel* getActivePanel() { return mActivePanel; }
-
-	static BOOL filtersVisible(void* user_data);
-	void onClearSearch();
-	static void onFoldersByName(void *user_data);
-	static BOOL checkFoldersByName(void *user_data);
-	void onFilterEdit(const std::string& search_string );
-	static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
-	void onFilterSelected();
-
-	const std::string getFilterSubString() { return mActivePanel->getFilterSubString(); }
-	void setFilterSubString(const std::string& string) { mActivePanel->setFilterSubString(string); }
-	
-	// menu callbacks
-	void doToSelected(const LLSD& userdata);
-	void closeAllFolders();
-	void doCreate(const LLSD& userdata);
-	void resetFilters();
-	void setSortBy(const LLSD& userdata);
-	
-	// HACK: Until we can route this info through the instant message hierarchy
-	static BOOL sWearNewClothing;
-	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction
-
-	void toggleFindOptions();
-
-	LLFloaterInventoryFinder* getFinder() { return (LLFloaterInventoryFinder*)mFinderHandle.get(); }
+	// Inherited functionality
+	/*virtual*/ void changed(U32 mask);
+	/*virtual*/ void draw();
+	/*virtual*/ void onOpen(const LLSD& key);
 
+	LLInventoryPanel* getPanel();
 protected:
-	LLFilterEditor*				mFilterEditor;
-	LLTabContainer*				mFilterTabs;
-	LLHandle<LLFloater>			mFinderHandle;
-	LLInventoryPanel*			mActivePanel;
-	LLSaveFolderState*			mSavedFolderState;
-
-	std::string					mFilterText;
-
-private:
 	void updateTitle();
+private:
+	LLPanelMainInventory* mPanelMainInventory;
 };
 
-class LLSelectFirstFilteredItem : public LLFolderViewFunctor
-{
-public:
-	LLSelectFirstFilteredItem() : mItemSelected(FALSE) {}
-	virtual ~LLSelectFirstFilteredItem() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-	BOOL wasItemSelected() { return mItemSelected; }
-protected:
-	BOOL	mItemSelected;
-};
-
-class LLOpenFilteredFolders : public LLFolderViewFunctor
-{
-public:
-	LLOpenFilteredFolders()  {}
-	virtual ~LLOpenFilteredFolders() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-};
-
-class LLSaveFolderState : public LLFolderViewFunctor
-{
-public:
-	LLSaveFolderState() : mApply(FALSE) {}
-	virtual ~LLSaveFolderState() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item) {}
-	void setApply(BOOL apply);
-	void clearOpenFolders() { mOpenFolders.clear(); }
-protected:
-	std::set<LLUUID> mOpenFolders;
-	BOOL mApply;
-};
-
-class LLOpenFoldersWithSelection : public LLFolderViewFunctor
-{
-public:
-	LLOpenFoldersWithSelection() {}
-	virtual ~LLOpenFoldersWithSelection() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-};
-
-///----------------------------------------------------------------------------
-/// Function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-// useful functions with the inventory view
-
-class LLInventoryCategory;
-class LLInventoryItem;
-
-const std::string& get_item_icon_name(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-#endif // LL_LLINVENTORYVIEW_H
+#endif // LL_LLFLOATERINVENTORY_H
 
 
 
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index aa82dc34b7..b6ec0868cf 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -32,7 +32,7 @@
 
 /*
  * Shows the contents of an object.
- * A floater wrapper for llpanelinventory
+ * A floater wrapper for LLPanelObjectInventory
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -47,7 +47,8 @@
 #include "llinventorybridge.h"
 #include "llfloaterinventory.h"
 #include "llinventorymodel.h"
-#include "llpanelinventory.h"
+#include "llinventorypanel.h"
+#include "llpanelobjectinventory.h"
 #include "llfloaterreg.h"
 #include "llselectmgr.h"
 #include "lluiconstants.h"
@@ -58,7 +59,7 @@
 
 LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
 :	LLFloater(key),
-	mPanelInventory(NULL),
+	mPanelInventoryObject(NULL),
 	mDirty(TRUE)
 {
 //	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml");
@@ -74,7 +75,7 @@ LLFloaterOpenObject::~LLFloaterOpenObject()
 BOOL LLFloaterOpenObject::postBuild()
 {
 	childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
-	mPanelInventory = getChild<LLPanelInventory>("object_contents");
+	mPanelInventoryObject = getChild<LLPanelObjectInventory>("object_contents");
 	return TRUE;
 }
 
@@ -96,7 +97,7 @@ void LLFloaterOpenObject::onOpen(const LLSD& key)
 }
 void LLFloaterOpenObject::refresh()
 {
-	mPanelInventory->refresh();
+	mPanelInventoryObject->refresh();
 
 	std::string name;
 	BOOL enabled;
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index a61cc04941..10d96b7ea3 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -41,7 +41,7 @@
 #include "llfloater.h"
 
 class LLObjectSelection;
-class LLPanelInventory;
+class LLPanelObjectInventory;
 
 class LLFloaterOpenObject
 : public LLFloater
@@ -77,7 +77,7 @@ private:
 	
 protected:
 
-	LLPanelInventory*	mPanelInventory;
+	LLPanelObjectInventory*	mPanelInventoryObject;
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
 	BOOL mDirty;
 };
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 5fee84190b..3aef15a35c 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -54,7 +54,7 @@
 #include "llpanelcontents.h"
 #include "llpanelface.h"
 #include "llpanelland.h"
-#include "llpanelinventory.h"
+#include "llpanelobjectinventory.h"
 #include "llpanelobject.h"
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index de18e74752..a963c96da4 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -38,6 +38,7 @@
 #include "llinventorybridge.h"
 #include "llinventoryclipboard.h" // *TODO: remove this once hack below gone.
 #include "llinventoryfilter.h"
+#include "llinventoryfunctions.h"
 #include "llfoldertype.h"
 #include "llfloaterinventory.h"// hacked in for the bonus context menu items.
 #include "llkeyboard.h"
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index c4beb666ea..7399f1e1b3 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -70,6 +70,7 @@
 #include "llpanelimcontrolpanel.h"
 #include "llrecentpeople.h"
 #include "llresmgr.h"
+#include "lltooldraganddrop.h"
 #include "lltrans.h"
 #include "lltabcontainer.h"
 #include "llviewertexteditor.h"
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 59f70ea1bd..336025e55e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -62,7 +62,9 @@
 #include "llavataractions.h"
 #include "llgesturemgr.h"
 #include "lliconctrl.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llinventoryclipboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
@@ -275,7 +277,11 @@ void LLInvFVBridge::cutToClipboard()
 // *TODO: make sure this does the right thing
 void LLInvFVBridge::showProperties()
 {
-	LLFloaterReg::showInstance("properties", mUUID);
+	LLSD key;
+	key["id"] = mUUID;
+	LLSideTray::getInstance()->showPanel("sidepanel_inventory", key);
+
+	// LLFloaterReg::showInstance("properties", mUUID);
 }
 
 void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch)
@@ -506,7 +512,7 @@ BOOL LLInvFVBridge::isClipboardPasteableAsLink() const
 	return TRUE;
 }
 
-void hideContextEntries(LLMenuGL& menu,
+void hide_context_entries(LLMenuGL& menu, 
 						const std::vector<std::string> &entries_to_show,
 						const std::vector<std::string> &disabled_entries)
 {
@@ -521,7 +527,7 @@ void hideContextEntries(LLMenuGL& menu,
 		LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(*itor);
 		if ((name == "More") && branchp)
 		{
-			hideContextEntries(*branchp->getBranch(), entries_to_show, disabled_entries);
+			hide_context_entries(*branchp->getBranch(), entries_to_show, disabled_entries);
 		}
 
 
@@ -621,7 +627,7 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 
 		getClipboardEntries(true, items, disabled_items, flags);
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 // *TODO: remove this
@@ -2387,7 +2393,7 @@ void LLFolderBridge::folderOptionsMenu()
 		}
 		mItems.push_back(std::string("Take Off Items"));
 	}
-	hideContextEntries(*mMenu, mItems, disabled_items);
+	hide_context_entries(*mMenu, mItems, disabled_items);
 }
 
 BOOL LLFolderBridge::checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& is_type)
@@ -2526,7 +2532,7 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		mItems.push_back(std::string("--no options--"));
 		mDisabledItems.push_back(std::string("--no options--"));
 	}
-	hideContextEntries(menu, mItems, mDisabledItems);
+	hide_context_entries(menu, mItems, mDisabledItems);
 }
 
 BOOL LLFolderBridge::hasChildren() const
@@ -3147,7 +3153,7 @@ void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	items.push_back(std::string("Sound Separator"));
 	items.push_back(std::string("Sound Play"));
 
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 // +=================================================+
@@ -3204,7 +3210,7 @@ void LLLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		disabled_items.push_back(std::string("About Landmark"));
 	}
 
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 // Convenience function for the two functions below.
@@ -3433,7 +3439,7 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			disabled_items.push_back(std::string("Conference Chat"));
 		}
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
@@ -3662,7 +3668,7 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		items.push_back(std::string("Activate"));
 		items.push_back(std::string("Deactivate"));
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 // +=================================================+
@@ -3702,7 +3708,7 @@ void LLAnimationBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	items.push_back(std::string("Animation Play"));
 	items.push_back(std::string("Animation Audition"));
 
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 
 }
 
@@ -3847,6 +3853,10 @@ void LLObjectBridge::openItem()
 		LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
 	}
 
+	LLSD key;
+	key["id"] = mUUID;
+	LLSideTray::getInstance()->showPanel("sidepanel_inventory", key);
+
 	/*
 	LLFloaterReg::showInstance("properties", mUUID);
 	*/
@@ -4058,7 +4068,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			}
 		}
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 BOOL LLObjectBridge::renameItem(const std::string& new_name)
@@ -4471,7 +4481,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			}
 		}
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 // Called from menus
@@ -5043,7 +5053,7 @@ void LLLinkItemBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			disabled_items.push_back(std::string("Delete"));
 		}
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 
@@ -5094,7 +5104,7 @@ void LLLinkFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			disabled_items.push_back(std::string("Delete"));
 		}
 	}
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 void LLLinkFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 6b2a2d32de..3f3513a665 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -41,6 +41,7 @@
 #include "llfoldervieweventlistener.h"
 
 class LLInventoryPanel;
+class LLMenuGL;
 
 enum EInventoryIcon
 {
@@ -121,7 +122,7 @@ protected:
 };
 
 const std::string safe_inv_type_lookup(LLInventoryType::EType inv_type);
-void hideContextEntries(LLMenuGL& menu, 
+void hide_context_entries(LLMenuGL& menu, 
 						const std::vector<std::string> &entries_to_show,
 						const std::vector<std::string> &disabled_entries);
 
@@ -807,5 +808,9 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
 
 void teleport_via_landmark(const LLUUID& asset_id);
 
+// Utility function to hide all entries except those in the list
+void hide_context_entries(LLMenuGL& menu, 
+		const std::vector<std::string> &entries_to_show, 
+		const std::vector<std::string> &disabled_entries);
 
 #endif // LL_LLINVENTORYBRIDGE_H
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
new file mode 100644
index 0000000000..694f702654
--- /dev/null
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -0,0 +1,344 @@
+/** 

+ * @file llfloaterinventory.cpp

+ * @brief Implementation of the inventory view and associated stuff.

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include <utility> // for std::pair<>

+

+#include "llinventoryfunctions.h"

+

+// library includes

+#include "llagent.h"

+#include "llagentwearables.h"

+#include "llcallingcard.h"

+#include "llfloaterreg.h"

+#include "llsdserialize.h"

+#include "llfiltereditor.h"

+#include "llspinctrl.h"

+#include "llui.h"

+#include "message.h"

+

+// newview includes

+#include "llappearancemgr.h"

+#include "llappviewer.h"

+#include "llfirstuse.h"

+#include "llfloaterchat.h"

+#include "llfloatercustomize.h"

+#include "llfocusmgr.h"

+#include "llfolderview.h"

+#include "llgesturemgr.h"

+#include "lliconctrl.h"

+#include "llimview.h"

+#include "llinventorybridge.h"

+#include "llinventoryclipboard.h"

+#include "llinventorymodel.h"

+#include "llinventorypanel.h"

+#include "lllineeditor.h"

+#include "llmenugl.h"

+#include "llpreviewanim.h"

+#include "llpreviewgesture.h"

+#include "llpreviewnotecard.h"

+#include "llpreviewscript.h"

+#include "llpreviewsound.h"

+#include "llpreviewtexture.h"

+#include "llresmgr.h"

+#include "llscrollbar.h"

+#include "llscrollcontainer.h"

+#include "llselectmgr.h"

+#include "lltabcontainer.h"

+#include "lltooldraganddrop.h"

+#include "lluictrlfactory.h"

+#include "llviewerinventory.h"

+#include "llviewermessage.h"

+#include "llviewerobjectlist.h"

+#include "llviewerregion.h"

+#include "llviewerwindow.h"

+#include "llvoavatarself.h"

+#include "llwearablelist.h"

+

+BOOL LLInventoryState::sWearNewClothing = FALSE;

+LLUUID LLInventoryState::sWearNewClothingTransactionID;

+

+void LLSaveFolderState::setApply(BOOL apply)

+{

+	mApply = apply; 

+	// before generating new list of open folders, clear the old one

+	if(!apply) 

+	{

+		clearOpenFolders(); 

+	}

+}

+

+void LLSaveFolderState::doFolder(LLFolderViewFolder* folder)

+{

+	LLMemType mt(LLMemType::MTYPE_INVENTORY_DO_FOLDER);

+	if(mApply)

+	{

+		// we're applying the open state

+		LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();

+		if(!bridge) return;

+		LLUUID id(bridge->getUUID());

+		if(mOpenFolders.find(id) != mOpenFolders.end())

+		{

+			folder->setOpen(TRUE);

+		}

+		else

+		{

+			// keep selected filter in its current state, this is less jarring to user

+			if (!folder->isSelected())

+			{

+				folder->setOpen(FALSE);

+			}

+		}

+	}

+	else

+	{

+		// we're recording state at this point

+		if(folder->isOpen())

+		{

+			LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener();

+			if(!bridge) return;

+			mOpenFolders.insert(bridge->getUUID());

+		}

+	}

+}

+

+void LLOpenFilteredFolders::doItem(LLFolderViewItem *item)

+{

+	if (item->getFiltered())

+	{

+		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+	}

+}

+

+void LLOpenFilteredFolders::doFolder(LLFolderViewFolder* folder)

+{

+	if (folder->getFiltered() && folder->getParentFolder())

+	{

+		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+	}

+	// if this folder didn't pass the filter, and none of its descendants did

+	else if (!folder->getFiltered() && !folder->hasFilteredDescendants())

+	{

+		folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_NO);

+	}

+}

+

+void LLSelectFirstFilteredItem::doItem(LLFolderViewItem *item)

+{

+	if (item->getFiltered() && !mItemSelected)

+	{

+		item->getRoot()->setSelection(item, FALSE, FALSE);

+		if (item->getParentFolder())

+		{

+			item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+		}

+		item->getRoot()->scrollToShowSelection();

+		mItemSelected = TRUE;

+	}

+}

+

+void LLSelectFirstFilteredItem::doFolder(LLFolderViewFolder* folder)

+{

+	if (folder->getFiltered() && !mItemSelected)

+	{

+		folder->getRoot()->setSelection(folder, FALSE, FALSE);

+		if (folder->getParentFolder())

+		{

+			folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+		}

+		folder->getRoot()->scrollToShowSelection();

+		mItemSelected = TRUE;

+	}

+}

+

+void LLOpenFoldersWithSelection::doItem(LLFolderViewItem *item)

+{

+	if (item->getParentFolder() && item->isSelected())

+	{

+		item->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+	}

+}

+

+void LLOpenFoldersWithSelection::doFolder(LLFolderViewFolder* folder)

+{

+	if (folder->getParentFolder() && folder->isSelected())

+	{

+		folder->getParentFolder()->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);

+	}

+}

+

+const std::string& get_item_icon_name(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point,

+							 BOOL item_is_multi )

+{

+	EInventoryIcon idx = OBJECT_ICON_NAME;

+	if ( item_is_multi )

+	{

+		idx = OBJECT_MULTI_ICON_NAME;

+	}

+	

+	switch(asset_type)

+	{

+	case LLAssetType::AT_TEXTURE:

+		if(LLInventoryType::IT_SNAPSHOT == inventory_type)

+		{

+			idx = SNAPSHOT_ICON_NAME;

+		}

+		else

+		{

+			idx = TEXTURE_ICON_NAME;

+		}

+		break;

+

+	case LLAssetType::AT_SOUND:

+		idx = SOUND_ICON_NAME;

+		break;

+	case LLAssetType::AT_CALLINGCARD:

+		if(attachment_point!= 0)

+		{

+			idx = CALLINGCARD_ONLINE_ICON_NAME;

+		}

+		else

+		{

+			idx = CALLINGCARD_OFFLINE_ICON_NAME;

+		}

+		break;

+	case LLAssetType::AT_LANDMARK:

+		if(attachment_point!= 0)

+		{

+			idx = LANDMARK_VISITED_ICON_NAME;

+		}

+		else

+		{

+			idx = LANDMARK_ICON_NAME;

+		}

+		break;

+	case LLAssetType::AT_SCRIPT:

+	case LLAssetType::AT_LSL_TEXT:

+	case LLAssetType::AT_LSL_BYTECODE:

+		idx = SCRIPT_ICON_NAME;

+		break;

+	case LLAssetType::AT_CLOTHING:

+		idx = CLOTHING_ICON_NAME;

+	case LLAssetType::AT_BODYPART :

+		if(LLAssetType::AT_BODYPART == asset_type)

+		{

+			idx = BODYPART_ICON_NAME;

+		}

+		switch(LLInventoryItem::II_FLAGS_WEARABLES_MASK & attachment_point)

+		{

+		case WT_SHAPE:

+			idx = BODYPART_SHAPE_ICON_NAME;

+			break;

+		case WT_SKIN:

+			idx = BODYPART_SKIN_ICON_NAME;

+			break;

+		case WT_HAIR:

+			idx = BODYPART_HAIR_ICON_NAME;

+			break;

+		case WT_EYES:

+			idx = BODYPART_EYES_ICON_NAME;

+			break;

+		case WT_SHIRT:

+			idx = CLOTHING_SHIRT_ICON_NAME;

+			break;

+		case WT_PANTS:

+			idx = CLOTHING_PANTS_ICON_NAME;

+			break;

+		case WT_SHOES:

+			idx = CLOTHING_SHOES_ICON_NAME;

+			break;

+		case WT_SOCKS:

+			idx = CLOTHING_SOCKS_ICON_NAME;

+			break;

+		case WT_JACKET:

+			idx = CLOTHING_JACKET_ICON_NAME;

+			break;

+		case WT_GLOVES:

+			idx = CLOTHING_GLOVES_ICON_NAME;

+			break;

+		case WT_UNDERSHIRT:

+			idx = CLOTHING_UNDERSHIRT_ICON_NAME;

+			break;

+		case WT_UNDERPANTS:

+			idx = CLOTHING_UNDERPANTS_ICON_NAME;

+			break;

+		case WT_SKIRT:

+			idx = CLOTHING_SKIRT_ICON_NAME;

+			break;

+		case WT_ALPHA:

+			idx = CLOTHING_ALPHA_ICON_NAME;

+			break;

+		case WT_TATTOO:

+			idx = CLOTHING_TATTOO_ICON_NAME;

+			break;

+		default:

+			// no-op, go with choice above

+			break;

+		}

+		break;

+	case LLAssetType::AT_NOTECARD:

+		idx = NOTECARD_ICON_NAME;

+		break;

+	case LLAssetType::AT_ANIMATION:

+		idx = ANIMATION_ICON_NAME;

+		break;

+	case LLAssetType::AT_GESTURE:

+		idx = GESTURE_ICON_NAME;

+		break;

+	case LLAssetType::AT_FAVORITE:

+		//TODO - need bette idx

+		idx = LANDMARK_ICON_NAME;

+		break;

+	case LLAssetType::AT_LINK:

+		idx = LINKITEM_ICON_NAME;

+		break;

+	case LLAssetType::AT_LINK_FOLDER:

+		idx = LINKFOLDER_ICON_NAME;

+		break;

+	default:

+		break;

+	}

+	

+	return ICON_NAME[idx];

+}

+

+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point,

+							 BOOL item_is_multi)

+{

+	const std::string& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );

+	return LLUI::getUIImage(icon_name);

+}

diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
new file mode 100644
index 0000000000..efd40576a7
--- /dev/null
+++ b/indra/newview/llinventoryfunctions.h
@@ -0,0 +1,136 @@
+/** 

+ * @file llinventoryfunctions.h

+ * @brief Miscellaneous inventory-related functions and classes

+ * class definition

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLINVENTORYFUNCTIONS_H

+#define LL_LLINVENTORYFUNCTIONS_H

+

+#include "llassetstorage.h"

+#include "lldarray.h"

+#include "llfloater.h"

+#include "llinventory.h"

+#include "llinventoryfilter.h"

+#include "llfolderview.h"

+#include "llinventorymodel.h"

+#include "lluictrlfactory.h"

+#include <set>

+

+

+class LLFolderViewItem;

+class LLInventoryFilter;

+class LLInventoryModel;

+class LLInventoryPanel;

+class LLInvFVBridge;

+class LLInventoryFVBridgeBuilder;

+class LLMenuBarGL;

+class LLCheckBoxCtrl;

+class LLSpinCtrl;

+class LLScrollContainer;

+class LLTextBox;

+class LLIconCtrl;

+class LLSaveFolderState;

+class LLFilterEditor;

+class LLTabContainer;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+//

+// This is a collection of miscellaneous functions and classes

+// that don't fit cleanly into any other class header.

+//

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+class LLInventoryState

+{

+public:

+	// HACK: Until we can route this info through the instant message hierarchy

+	static BOOL sWearNewClothing;

+	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction	

+};

+

+class LLSelectFirstFilteredItem : public LLFolderViewFunctor

+{

+public:

+	LLSelectFirstFilteredItem() : mItemSelected(FALSE) {}

+	virtual ~LLSelectFirstFilteredItem() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+	BOOL wasItemSelected() { return mItemSelected; }

+protected:

+	BOOL	mItemSelected;

+};

+

+class LLOpenFilteredFolders : public LLFolderViewFunctor

+{

+public:

+	LLOpenFilteredFolders()  {}

+	virtual ~LLOpenFilteredFolders() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+};

+

+class LLSaveFolderState : public LLFolderViewFunctor

+{

+public:

+	LLSaveFolderState() : mApply(FALSE) {}

+	virtual ~LLSaveFolderState() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item) {}

+	void setApply(BOOL apply);

+	void clearOpenFolders() { mOpenFolders.clear(); }

+protected:

+	std::set<LLUUID> mOpenFolders;

+	BOOL mApply;

+};

+

+class LLOpenFoldersWithSelection : public LLFolderViewFunctor

+{

+public:

+	LLOpenFoldersWithSelection() {}

+	virtual ~LLOpenFoldersWithSelection() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+};

+

+const std::string& get_item_icon_name(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point, 

+							 BOOL item_is_multi );

+

+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point, 

+							 BOOL item_is_multi );

+

+#endif // LL_LLINVENTORYFUNCTIONS_H

+

+

+

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 1d7cbde0d5..23439191f3 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -46,6 +46,8 @@
 #include "llfloater.h"
 #include "llfocusmgr.h"
 #include "llinventorybridge.h"
+#include "llinventoryfunctions.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 #include "llviewerinventory.h"
 #include "llviewermessage.h"
@@ -3174,13 +3176,13 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 	// The incoming inventory could span more than one BulkInventoryUpdate packet,
 	// so record the transaction ID for this purchase, then wear all clothing
 	// that comes in as part of that transaction ID.  JC
-	if (LLFloaterInventory::sWearNewClothing)
+	if (LLInventoryState::sWearNewClothing)
 	{
-		LLFloaterInventory::sWearNewClothingTransactionID = tid;
-		LLFloaterInventory::sWearNewClothing = FALSE;
+		LLInventoryState::sWearNewClothingTransactionID = tid;
+		LLInventoryState::sWearNewClothing = FALSE;
 	}
 
-	if (tid == LLFloaterInventory::sWearNewClothingTransactionID)
+	if (tid == LLInventoryState::sWearNewClothingTransactionID)
 	{
 		count = wearable_ids.size();
 		for (i = 0; i < count; ++i)
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index ea528a1df8..c28792a711 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -51,7 +51,7 @@
 // project includes
 #include "llagent.h"
 #include "llfloaterbulkpermission.h"
-#include "llpanelinventory.h"
+#include "llpanelobjectinventory.h"
 #include "llpreviewscript.h"
 #include "llresmgr.h"
 #include "llselectmgr.h"
@@ -89,14 +89,14 @@ BOOL LLPanelContents::postBuild()
 	childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
 	childSetAction("button permissions",&LLPanelContents::onClickPermissions, this);
 
-	mPanelInventory = getChild<LLPanelInventory>("contents_inventory");
+	mPanelInventoryObject = getChild<LLPanelObjectInventory>("contents_inventory");
 
 	return TRUE;
 }
 
 LLPanelContents::LLPanelContents()
 	:	LLPanel(),
-		mPanelInventory(NULL)
+		mPanelInventoryObject(NULL)
 {
 }
 
@@ -139,9 +139,9 @@ void LLPanelContents::refresh()
 	LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
 
 	getState(object);
-	if (mPanelInventory)
+	if (mPanelInventoryObject)
 	{
-		mPanelInventory->refresh();
+		mPanelInventoryObject->refresh();
 	}	
 }
 
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
index bab980b524..14256845a6 100644
--- a/indra/newview/llpanelcontents.h
+++ b/indra/newview/llpanelcontents.h
@@ -35,9 +35,14 @@
 
 #include "v3math.h"
 #include "llpanel.h"
+#include "llinventory.h"
+#include "lluuid.h"
+#include "llmap.h"
+#include "llviewerobject.h"
+#include "llvoinventorylistener.h"
 
 class LLButton;
-class LLPanelInventory;
+class LLPanelObjectInventory;
 class LLViewerObject;
 class LLCheckBoxCtrl;
 class LLSpinCtrl;
@@ -70,7 +75,7 @@ protected:
 	void				getState(LLViewerObject *object);
 
 public:
-	LLPanelInventory* mPanelInventory;
+	LLPanelObjectInventory* mPanelInventoryObject;
 };
 
-#endif
+#endif // LL_LLPANELCONTENTS_H
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 0ce85818dd..22138a81ec 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -38,6 +38,7 @@
 
 #include "llinventory.h"
 #include "llviewerinventory.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
 #include "llfloaterinventory.h"
 #include "llagent.h"
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 48a93f0d42..78aa04762d 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -47,6 +47,7 @@
 #include "lldndbutton.h"
 #include "llfloaterworldmap.h"
 #include "llfolderviewitem.h"
+#include "llinventorypanel.h"
 #include "llinventorysubtreepanel.h"
 #include "lllandmarkactions.h"
 #include "llplacesinventorybridge.h"
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
new file mode 100644
index 0000000000..ca567018e7
--- /dev/null
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -0,0 +1,818 @@
+/** 

+ * @file llsidepanelmaininventory.cpp

+ * @brief Implementation of llsidepanelmaininventory.

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "llpanelmaininventory.h"

+

+#include "llfloaterinventory.h"

+#include "llinventorybridge.h"

+#include "llinventoryfunctions.h"

+#include "llinventorypanel.h"

+#include "llfiltereditor.h"

+#include "llfloaterreg.h"

+#include "llscrollcontainer.h"

+#include "llsdserialize.h"

+#include "llspinctrl.h"

+#include "lltooldraganddrop.h"

+

+static LLRegisterPanelClassWrapper<LLPanelMainInventory> t_inventory("panel_main_inventory"); // Seraph is this redundant with constructor?

+

+///----------------------------------------------------------------------------

+/// LLFloaterInventoryFinder

+///----------------------------------------------------------------------------

+

+class LLFloaterInventoryFinder : public LLFloater

+{

+public:

+	LLFloaterInventoryFinder( LLPanelMainInventory* inventory_view);

+	virtual void draw();

+	/*virtual*/	BOOL	postBuild();

+	void changeFilter(LLInventoryFilter* filter);

+	void updateElementsFromFilter();

+	BOOL getCheckShowEmpty();

+	BOOL getCheckSinceLogoff();

+

+	static void onTimeAgo(LLUICtrl*, void *);

+	static void onCheckSinceLogoff(LLUICtrl*, void *);

+	static void onCloseBtn(void* user_data);

+	static void selectAllTypes(void* user_data);

+	static void selectNoTypes(void* user_data);

+private:

+	LLPanelMainInventory*	mPanelInventoryDecorated;

+	LLSpinCtrl*			mSpinSinceDays;

+	LLSpinCtrl*			mSpinSinceHours;

+	LLInventoryFilter*	mFilter;

+};

+

+///----------------------------------------------------------------------------

+/// LLPanelMainInventory

+///----------------------------------------------------------------------------

+

+LLPanelMainInventory::LLPanelMainInventory()

+	: LLPanel()

+{

+	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_INIT);

+	// Menu Callbacks (non contex menus)

+	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));

+	mCommitCallbackRegistrar.add("Inventory.CloseAllFolders", boost::bind(&LLPanelMainInventory::closeAllFolders, this));

+	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));

+	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_LOST_AND_FOUND));

+	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLPanelMainInventory::doCreate, this, _2));

+ 	mCommitCallbackRegistrar.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow, this));

+	mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLPanelMainInventory::toggleFindOptions, this));

+	mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLPanelMainInventory::resetFilters, this));

+	mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLPanelMainInventory::setSortBy, this, _2));

+

+	// Controls

+	// *TODO: Just use persistant settings for each of these

+	U32 sort_order = gSavedSettings.getU32("InventorySortOrder");

+	BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );

+	BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );

+	BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );

+	

+	gSavedSettings.declareBOOL("Inventory.SortByName", sort_by_name, "Declared in code", FALSE);

+	gSavedSettings.declareBOOL("Inventory.SortByDate", !sort_by_name, "Declared in code", FALSE);

+	gSavedSettings.declareBOOL("Inventory.FoldersAlwaysByName", sort_folders_by_name, "Declared in code", FALSE);

+	gSavedSettings.declareBOOL("Inventory.SystemFoldersToTop", sort_system_folders_to_top, "Declared in code", FALSE);

+	

+	mSavedFolderState = new LLSaveFolderState();

+	mSavedFolderState->setApply(FALSE);

+}

+

+BOOL LLPanelMainInventory::postBuild()

+{

+	gInventory.addObserver(this);

+	

+	mFilterTabs = getChild<LLTabContainer>("inventory filter tabs");

+	mFilterTabs->setCommitCallback(boost::bind(&LLPanelMainInventory::onFilterSelected, this));

+	

+	//panel->getFilter()->markDefault();

+

+	// Set up the default inv. panel/filter settings.

+	mActivePanel = getChild<LLInventoryPanel>("All Items");

+	if (mActivePanel)

+	{

+		// "All Items" is the previous only view, so it gets the InventorySortOrder

+		mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));

+		mActivePanel->getFilter()->markDefault();

+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);

+		mActivePanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mActivePanel, _1, _2));

+	}

+	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");

+	if (recent_items_panel)

+	{

+		recent_items_panel->setSinceLogoff(TRUE);

+		recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);

+		recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);

+		recent_items_panel->getFilter()->markDefault();

+		recent_items_panel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, recent_items_panel, _1, _2));

+	}

+

+	// Now load the stored settings from disk, if available.

+	std::ostringstream filterSaveName;

+	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");

+	llinfos << "LLPanelMainInventory::init: reading from " << filterSaveName << llendl;

+	llifstream file(filterSaveName.str());

+	LLSD savedFilterState;

+	if (file.is_open())

+	{

+		LLSDSerialize::fromXML(savedFilterState, file);

+		file.close();

+

+		// Load the persistent "Recent Items" settings.

+		// Note that the "All Items" settings do not persist.

+		if(recent_items_panel)

+		{

+			if(savedFilterState.has(recent_items_panel->getFilter()->getName()))

+			{

+				LLSD recent_items = savedFilterState.get(

+					recent_items_panel->getFilter()->getName());

+				recent_items_panel->getFilter()->fromLLSD(recent_items);

+			}

+		}

+

+	}

+

+

+	mFilterEditor = getChild<LLFilterEditor>("inventory search editor");

+	if (mFilterEditor)

+	{

+		mFilterEditor->setCommitCallback(boost::bind(&LLPanelMainInventory::onFilterEdit, this, _2));

+	}

+

+	// *TODO:Get the cost info from the server

+	const std::string upload_cost("10");

+	childSetLabelArg("Upload Image", "[COST]", upload_cost);

+	childSetLabelArg("Upload Sound", "[COST]", upload_cost);

+	childSetLabelArg("Upload Animation", "[COST]", upload_cost);

+	childSetLabelArg("Bulk Upload", "[COST]", upload_cost);

+	

+	return TRUE;

+}

+

+// Destroys the object

+LLPanelMainInventory::~LLPanelMainInventory( void )

+{

+	// Save the filters state.

+	LLSD filterRoot;

+	LLInventoryPanel* all_items_panel = getChild<LLInventoryPanel>("All Items");

+	if (all_items_panel)

+	{

+		LLInventoryFilter* filter = all_items_panel->getFilter();

+		if (filter)

+		{

+			LLSD filterState;

+			filter->toLLSD(filterState);

+			filterRoot[filter->getName()] = filterState;

+		}

+	}

+

+	LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");

+	if (recent_items_panel)

+	{

+		LLInventoryFilter* filter = recent_items_panel->getFilter();

+		if (filter)

+		{

+			LLSD filterState;

+			filter->toLLSD(filterState);

+			filterRoot[filter->getName()] = filterState;

+		}

+	}

+

+	std::ostringstream filterSaveName;

+	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");

+	llofstream filtersFile(filterSaveName.str());

+	if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))

+	{

+		llwarns << "Could not write to filters save file " << filterSaveName << llendl;

+	}

+	else

+		filtersFile.close();

+

+	gInventory.removeObserver(this);

+	delete mSavedFolderState;

+}

+

+void LLPanelMainInventory::startSearch()

+{

+	// this forces focus to line editor portion of search editor

+	if (mFilterEditor)

+	{

+		mFilterEditor->focusFirstItem(TRUE);

+	}

+}

+

+BOOL LLPanelMainInventory::handleKeyHere(KEY key, MASK mask)

+{

+	LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : NULL;

+	if (root_folder)

+	{

+		// first check for user accepting current search results

+		if (mFilterEditor 

+			&& mFilterEditor->hasFocus()

+		    && (key == KEY_RETURN 

+		    	|| key == KEY_DOWN)

+		    && mask == MASK_NONE)

+		{

+			// move focus to inventory proper

+			mActivePanel->setFocus(TRUE);

+			root_folder->scrollToShowSelection();

+			return TRUE;

+		}

+

+		if (mActivePanel->hasFocus() && key == KEY_UP)

+		{

+			startSearch();

+		}

+	}

+

+	return LLPanel::handleKeyHere(key, mask);

+

+}

+

+//----------------------------------------------------------------------------

+// menu callbacks

+

+void LLPanelMainInventory::doToSelected(const LLSD& userdata)

+{

+	getPanel()->getRootFolder()->doToSelected(&gInventory, userdata);

+}

+

+void LLPanelMainInventory::closeAllFolders()

+{

+	getPanel()->getRootFolder()->closeAllFolders();

+}

+

+void LLPanelMainInventory::newWindow()

+{

+	LLFloaterInventory::showAgentInventory();

+}

+

+void LLPanelMainInventory::doCreate(const LLSD& userdata)

+{

+	menu_create_inventory_item(getPanel()->getRootFolder(), NULL, userdata);

+}

+

+void LLPanelMainInventory::resetFilters()

+{

+	LLFloaterInventoryFinder *finder = getFinder();

+	getActivePanel()->getFilter()->resetDefault();

+	if (finder)

+	{

+		finder->updateElementsFromFilter();

+	}

+

+	setFilterTextFromFilter();

+}

+

+void LLPanelMainInventory::setSortBy(const LLSD& userdata)

+{

+	std::string sort_field = userdata.asString();

+	if (sort_field == "name")

+	{

+		U32 order = getActivePanel()->getSortOrder();

+		getActivePanel()->setSortOrder( order & ~LLInventoryFilter::SO_DATE );

+			

+		gSavedSettings.setBOOL("Inventory.SortByName", TRUE );

+		gSavedSettings.setBOOL("Inventory.SortByDate", FALSE );

+	}

+	else if (sort_field == "date")

+	{

+		U32 order = getActivePanel()->getSortOrder();

+		getActivePanel()->setSortOrder( order | LLInventoryFilter::SO_DATE );

+

+		gSavedSettings.setBOOL("Inventory.SortByName", FALSE );

+		gSavedSettings.setBOOL("Inventory.SortByDate", TRUE );

+	}

+	else if (sort_field == "foldersalwaysbyname")

+	{

+		U32 order = getActivePanel()->getSortOrder();

+		if ( order & LLInventoryFilter::SO_FOLDERS_BY_NAME )

+		{

+			order &= ~LLInventoryFilter::SO_FOLDERS_BY_NAME;

+

+			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", FALSE );

+		}

+		else

+		{

+			order |= LLInventoryFilter::SO_FOLDERS_BY_NAME;

+

+			gSavedSettings.setBOOL("Inventory.FoldersAlwaysByName", TRUE );

+		}

+		getActivePanel()->setSortOrder( order );

+	}

+	else if (sort_field == "systemfolderstotop")

+	{

+		U32 order = getActivePanel()->getSortOrder();

+		if ( order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP )

+		{

+			order &= ~LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;

+

+			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", FALSE );

+		}

+		else

+		{

+			order |= LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;

+

+			gSavedSettings.setBOOL("Inventory.SystemFoldersToTop", TRUE );

+		}

+		getActivePanel()->setSortOrder( order );

+	}

+}

+

+// static

+BOOL LLPanelMainInventory::filtersVisible(void* user_data)

+{

+	LLPanelMainInventory* self = (LLPanelMainInventory*)user_data;

+	if(!self) return FALSE;

+

+	return self->getFinder() != NULL;

+}

+

+void LLPanelMainInventory::onClearSearch()

+{

+	LLFloater *finder = getFinder();

+	if (mActivePanel)

+	{

+		mActivePanel->setFilterSubString(LLStringUtil::null);

+		mActivePanel->setFilterTypes(0xffffffff);

+	}

+

+	if (finder)

+	{

+		LLFloaterInventoryFinder::selectAllTypes(finder);

+	}

+

+	// re-open folders that were initially open

+	if (mActivePanel)

+	{

+		mSavedFolderState->setApply(TRUE);

+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);

+		LLOpenFoldersWithSelection opener;

+		mActivePanel->getRootFolder()->applyFunctorRecursively(opener);

+		mActivePanel->getRootFolder()->scrollToShowSelection();

+	}

+}

+

+void LLPanelMainInventory::onFilterEdit(const std::string& search_string )

+{

+	if (search_string == "")

+	{

+		onClearSearch();

+	}

+	if (!mActivePanel)

+	{

+		return;

+	}

+

+	gInventory.startBackgroundFetch();

+

+	std::string uppercase_search_string = search_string;

+	LLStringUtil::toUpper(uppercase_search_string);

+	if (mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty())

+	{

+			// current filter and new filter empty, do nothing

+			return;

+	}

+

+	// save current folder open state if no filter currently applied

+	if (!mActivePanel->getRootFolder()->isFilterModified())

+	{

+		mSavedFolderState->setApply(FALSE);

+		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);

+	}

+

+	// set new filter string

+	mActivePanel->setFilterSubString(uppercase_search_string);

+}

+

+

+ //static

+ BOOL LLPanelMainInventory::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)

+ {

+ 	LLPanelMainInventory* active_view = NULL;

+	

+	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)

+	{

+		LLPanelMainInventory* iv = dynamic_cast<LLPanelMainInventory*>(*iter);

+		if (iv)

+		{

+			if (gFocusMgr.childHasKeyboardFocus(iv))

+			{

+				active_view = iv;

+				break;

+			}

+ 		}

+ 	}

+

+ 	if (!active_view)

+ 	{

+ 		return FALSE;

+ 	}

+

+ 	std::string search_string(find_text);

+

+ 	if (search_string.empty())

+ 	{

+ 		return FALSE;

+ 	}

+

+ 	if (active_view->getPanel() &&

+ 		active_view->getPanel()->getRootFolder()->search(first_item, search_string, backward))

+ 	{

+ 		return TRUE;

+ 	}

+

+ 	return FALSE;

+ }

+

+void LLPanelMainInventory::onFilterSelected()

+{

+	// Find my index

+	mActivePanel = (LLInventoryPanel*)childGetVisibleTab("inventory filter tabs");

+

+	if (!mActivePanel)

+	{

+		return;

+	}

+	LLInventoryFilter* filter = mActivePanel->getFilter();

+	LLFloaterInventoryFinder *finder = getFinder();

+	if (finder)

+	{

+		finder->changeFilter(filter);

+	}

+	if (filter->isActive())

+	{

+		// If our filter is active we may be the first thing requiring a fetch so we better start it here.

+		gInventory.startBackgroundFetch();

+	}

+	setFilterTextFromFilter();

+}

+

+const std::string LLPanelMainInventory::getFilterSubString() 

+{ 

+	return mActivePanel->getFilterSubString(); 

+}

+

+void LLPanelMainInventory::setFilterSubString(const std::string& string) 

+{ 

+	mActivePanel->setFilterSubString(string); 

+}

+

+BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,

+										 EDragAndDropType cargo_type,

+										 void* cargo_data,

+										 EAcceptance* accept,

+										 std::string& tooltip_msg)

+{

+	// Check to see if we are auto scrolling from the last frame

+	LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();

+	BOOL needsToScroll = panel->getScrollableContainer()->autoScroll(x, y);

+	if(mFilterTabs)

+	{

+		if(needsToScroll)

+		{

+			mFilterTabs->startDragAndDropDelayTimer();

+		}

+	}

+	

+	BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);

+

+	return handled;

+}

+

+void LLPanelMainInventory::changed(U32 mask)

+{

+}

+

+

+void LLPanelMainInventory::setFilterTextFromFilter() 

+{ 

+	mFilterText = mActivePanel->getFilter()->getFilterText(); 

+}

+

+void LLPanelMainInventory::toggleFindOptions()

+{

+	LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_TOGGLE);

+	LLFloater *floater = getFinder();

+	if (!floater)

+	{

+		LLFloaterInventoryFinder * finder = new LLFloaterInventoryFinder(this);

+		mFinderHandle = finder->getHandle();

+		finder->openFloater();

+

+		LLFloater* parent_floater = gFloaterView->getParentFloater(this);

+		if (parent_floater) // Seraph: Fix this, shouldn't be null even for sidepanel

+			parent_floater->addDependentFloater(mFinderHandle);

+		// start background fetch of folders

+		gInventory.startBackgroundFetch();

+	}

+	else

+	{

+		floater->closeFloater();

+	}

+}

+

+void LLPanelMainInventory::setSelectCallback(const LLFolderView::signal_t::slot_type& cb)

+{

+	getChild<LLInventoryPanel>("All Items")->setSelectCallback(cb);

+	getChild<LLInventoryPanel>("Recent Items")->setSelectCallback(cb);

+}

+

+///----------------------------------------------------------------------------

+/// LLFloaterInventoryFinder

+///----------------------------------------------------------------------------

+

+LLFloaterInventoryFinder* LLPanelMainInventory::getFinder() 

+{ 

+	return (LLFloaterInventoryFinder*)mFinderHandle.get();

+}

+

+

+LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLPanelMainInventory* inventory_view) :	

+	LLFloater(LLSD()),

+	mPanelInventoryDecorated(inventory_view),

+	mFilter(inventory_view->getPanel()->getFilter())

+{

+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml", NULL);

+	updateElementsFromFilter();

+}

+

+

+void LLFloaterInventoryFinder::onCheckSinceLogoff(LLUICtrl *ctrl, void *user_data)

+{

+	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;

+	if (!self) return;

+

+	bool since_logoff= self->childGetValue("check_since_logoff");

+	

+	if (!since_logoff && 

+	    !(  self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() ) )

+	{

+		self->mSpinSinceHours->set(1.0f);

+	}	

+}

+BOOL LLFloaterInventoryFinder::postBuild()

+{

+	const LLRect& viewrect = mPanelInventoryDecorated->getRect();

+	setRect(LLRect(viewrect.mLeft - getRect().getWidth(), viewrect.mTop, viewrect.mLeft, viewrect.mTop - getRect().getHeight()));

+

+	childSetAction("All", selectAllTypes, this);

+	childSetAction("None", selectNoTypes, this);

+

+	mSpinSinceHours = getChild<LLSpinCtrl>("spin_hours_ago");

+	childSetCommitCallback("spin_hours_ago", onTimeAgo, this);

+

+	mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");

+	childSetCommitCallback("spin_days_ago", onTimeAgo, this);

+

+	//	mCheckSinceLogoff   = getChild<LLSpinCtrl>("check_since_logoff");

+	childSetCommitCallback("check_since_logoff", onCheckSinceLogoff, this);

+

+	childSetAction("Close", onCloseBtn, this);

+

+	updateElementsFromFilter();

+	return TRUE;

+}

+void LLFloaterInventoryFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)

+{

+	LLFloaterInventoryFinder *self = (LLFloaterInventoryFinder *)user_data;

+	if (!self) return;

+	

+	bool since_logoff=true;

+	if ( self->mSpinSinceDays->get() ||  self->mSpinSinceHours->get() )

+	{

+		since_logoff = false;

+	}

+	self->childSetValue("check_since_logoff", since_logoff);

+}

+

+void LLFloaterInventoryFinder::changeFilter(LLInventoryFilter* filter)

+{

+	mFilter = filter;

+	updateElementsFromFilter();

+}

+

+void LLFloaterInventoryFinder::updateElementsFromFilter()

+{

+	if (!mFilter)

+		return;

+

+	// Get data needed for filter display

+	U32 filter_types = mFilter->getFilterTypes();

+	std::string filter_string = mFilter->getFilterSubString();

+	LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();

+	U32 hours = mFilter->getHoursAgo();

+

+	// update the ui elements

+	setTitle(mFilter->getName());

+

+	childSetValue("check_animation", (S32) (filter_types & 0x1 << LLInventoryType::IT_ANIMATION));

+

+	childSetValue("check_calling_card", (S32) (filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));

+	childSetValue("check_clothing", (S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));

+	childSetValue("check_gesture", (S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));

+	childSetValue("check_landmark", (S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));

+	childSetValue("check_notecard", (S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));

+	childSetValue("check_object", (S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));

+	childSetValue("check_script", (S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));

+	childSetValue("check_sound", (S32) (filter_types & 0x1 << LLInventoryType::IT_SOUND));

+	childSetValue("check_texture", (S32) (filter_types & 0x1 << LLInventoryType::IT_TEXTURE));

+	childSetValue("check_snapshot", (S32) (filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));

+	childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);

+	childSetValue("check_since_logoff", mFilter->isSinceLogoff());

+	mSpinSinceHours->set((F32)(hours % 24));

+	mSpinSinceDays->set((F32)(hours / 24));

+}

+

+void LLFloaterInventoryFinder::draw()

+{

+	LLMemType mt(LLMemType::MTYPE_INVENTORY_DRAW);

+	U32 filter = 0xffffffff;

+	BOOL filtered_by_all_types = TRUE;

+

+	if (!childGetValue("check_animation"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_ANIMATION);

+		filtered_by_all_types = FALSE;

+	}

+

+

+	if (!childGetValue("check_calling_card"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_CALLINGCARD);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_clothing"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_WEARABLE);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_gesture"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_GESTURE);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_landmark"))

+

+

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_LANDMARK);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_notecard"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_NOTECARD);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_object"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_OBJECT);

+		filter &= ~(0x1 << LLInventoryType::IT_ATTACHMENT);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_script"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_LSL);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_sound"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_SOUND);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_texture"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_TEXTURE);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!childGetValue("check_snapshot"))

+	{

+		filter &= ~(0x1 << LLInventoryType::IT_SNAPSHOT);

+		filtered_by_all_types = FALSE;

+	}

+

+	if (!filtered_by_all_types)

+	{

+		// don't include folders in filter, unless I've selected everything

+		filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);

+	}

+

+	// update the panel, panel will update the filter

+	mPanelInventoryDecorated->getPanel()->setShowFolderState(getCheckShowEmpty() ?

+		LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);

+	mPanelInventoryDecorated->getPanel()->setFilterTypes(filter);

+	if (getCheckSinceLogoff())

+	{

+		mSpinSinceDays->set(0);

+		mSpinSinceHours->set(0);

+	}

+	U32 days = (U32)mSpinSinceDays->get();

+	U32 hours = (U32)mSpinSinceHours->get();

+	if (hours > 24)

+	{

+		days += hours / 24;

+		hours = (U32)hours % 24;

+		mSpinSinceDays->set((F32)days);

+		mSpinSinceHours->set((F32)hours);

+	}

+	hours += days * 24;

+	mPanelInventoryDecorated->getPanel()->setHoursAgo(hours);

+	mPanelInventoryDecorated->getPanel()->setSinceLogoff(getCheckSinceLogoff());

+	mPanelInventoryDecorated->setFilterTextFromFilter();

+

+	LLPanel::draw();

+}

+

+BOOL LLFloaterInventoryFinder::getCheckShowEmpty()

+{

+	return childGetValue("check_show_empty");

+}

+

+BOOL LLFloaterInventoryFinder::getCheckSinceLogoff()

+{

+	return childGetValue("check_since_logoff");

+}

+

+void LLFloaterInventoryFinder::onCloseBtn(void* user_data)

+{

+	LLFloaterInventoryFinder* finderp = (LLFloaterInventoryFinder*)user_data;

+	finderp->closeFloater();

+}

+

+// static

+void LLFloaterInventoryFinder::selectAllTypes(void* user_data)

+{

+	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;

+	if(!self) return;

+

+	self->childSetValue("check_animation", TRUE);

+	self->childSetValue("check_calling_card", TRUE);

+	self->childSetValue("check_clothing", TRUE);

+	self->childSetValue("check_gesture", TRUE);

+	self->childSetValue("check_landmark", TRUE);

+	self->childSetValue("check_notecard", TRUE);

+	self->childSetValue("check_object", TRUE);

+	self->childSetValue("check_script", TRUE);

+	self->childSetValue("check_sound", TRUE);

+	self->childSetValue("check_texture", TRUE);

+	self->childSetValue("check_snapshot", TRUE);

+}

+

+//static

+void LLFloaterInventoryFinder::selectNoTypes(void* user_data)

+{

+	LLFloaterInventoryFinder* self = (LLFloaterInventoryFinder*)user_data;

+	if(!self) return;

+

+	self->childSetValue("check_animation", FALSE);

+	self->childSetValue("check_calling_card", FALSE);

+	self->childSetValue("check_clothing", FALSE);

+	self->childSetValue("check_gesture", FALSE);

+	self->childSetValue("check_landmark", FALSE);

+	self->childSetValue("check_notecard", FALSE);

+	self->childSetValue("check_object", FALSE);

+	self->childSetValue("check_script", FALSE);

+	self->childSetValue("check_sound", FALSE);

+	self->childSetValue("check_texture", FALSE);

+	self->childSetValue("check_snapshot", FALSE);

+}

diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
new file mode 100644
index 0000000000..75526a3c98
--- /dev/null
+++ b/indra/newview/llpanelmaininventory.h
@@ -0,0 +1,125 @@
+/** 

+ * @file llpanelmaininventory.h

+ * @brief llpanelmaininventory.h

+ * class definition

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLPANELMAININVENTORY_H

+#define LL_LLPANELMAININVENTORY_H

+

+#include "llpanel.h"

+#include "llinventorymodel.h"

+#include "llfolderview.h"

+

+class LLFolderViewItem;

+class LLInventoryPanel;

+class LLSaveFolderState;

+class LLFilterEditor;

+class LLTabContainer;

+class LLFloaterInventoryFinder;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLPanelMainInventory

+//

+// This is a panel used to view and control an agent's inventory,

+// including all the fixin's (e.g. AllItems/RecentItems tabs, filter floaters).

+//

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLPanelMainInventory : public LLPanel, LLInventoryObserver

+{

+public:

+	friend class LLFloaterInventoryFinder;

+

+	LLPanelMainInventory();

+	~LLPanelMainInventory();

+

+	BOOL postBuild();

+

+	virtual BOOL handleKeyHere(KEY key, MASK mask);

+

+	// Inherited functionality

+	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,

+									   EDragAndDropType cargo_type,

+									   void* cargo_data,

+									   EAcceptance* accept,

+									   std::string& tooltip_msg);

+	/*virtual*/ void changed(U32 mask);

+

+	LLInventoryPanel* getPanel() { return mActivePanel; }

+	LLInventoryPanel* getActivePanel() { return mActivePanel; }

+

+	const std::string& getFilterText() const { return mFilterText; }

+	

+	void setSelectCallback(const LLFolderView::signal_t::slot_type& cb);

+

+protected:

+	//

+	// Misc functions

+	//

+	void setFilterTextFromFilter();

+	void startSearch();

+	

+	void toggleFindOptions();

+

+	static BOOL filtersVisible(void* user_data);

+	void onClearSearch();

+	static void onFoldersByName(void *user_data);

+	static BOOL checkFoldersByName(void *user_data);

+	void onFilterEdit(const std::string& search_string );

+	static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);

+	void onFilterSelected();

+

+	const std::string getFilterSubString();

+	void setFilterSubString(const std::string& string);

+	

+	// menu callbacks

+	void doToSelected(const LLSD& userdata);

+	void closeAllFolders();

+	void newWindow();

+	void doCreate(const LLSD& userdata);

+	void resetFilters();

+	void setSortBy(const LLSD& userdata);

+	

+private:

+	LLFloaterInventoryFinder* getFinder();

+

+	LLFilterEditor*				mFilterEditor;

+	LLTabContainer*				mFilterTabs;

+	LLHandle<LLFloater>			mFinderHandle;

+	LLInventoryPanel*			mActivePanel;

+	LLSaveFolderState*			mSavedFolderState;

+

+	std::string					mFilterText;

+};

+

+#endif // LL_LLPANELMAININVENTORY_H

+

+

+

diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 1ab4ff581e..58d9fe9b76 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -45,7 +45,6 @@ class LLUICtrl;
 class LLButton;
 class LLViewerObject;
 class LLComboBox;
-class LLPanelInventory;
 class LLColorSwatchCtrl;
 class LLTextureCtrl;
 class LLInventoryItem;
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
new file mode 100644
index 0000000000..365a6e632f
--- /dev/null
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -0,0 +1,1905 @@
+/**

+ * @file llsidepanelinventory.cpp

+ * @brief LLPanelObjectInventory class implementation

+ *

+ * $LicenseInfo:firstyear=2002&license=viewergpl$

+ * 

+ * Copyright (c) 2002-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+//*****************************************************************************

+//

+// Implementation of the panel inventory - used to view and control a

+// task's inventory.

+//

+//*****************************************************************************

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llpanelobjectinventory.h"

+

+#include "roles_constants.h"

+

+#include "llagent.h"

+#include "llcallbacklist.h"

+#include "llfloaterbuycurrency.h"

+#include "llfloaterreg.h"

+#include "llinventorybridge.h"

+#include "llinventoryfunctions.h"

+#include "llpreviewanim.h"

+#include "llpreviewgesture.h"

+#include "llpreviewnotecard.h"

+#include "llpreviewscript.h"

+#include "llpreviewsound.h"

+#include "llpreviewtexture.h"

+#include "llscrollcontainer.h"

+#include "llselectmgr.h"

+#include "llstatusbar.h"

+#include "lltrans.h"

+#include "llviewerregion.h"

+#include "llviewerobjectlist.h"

+#include "llviewermessage.h"

+

+

+///----------------------------------------------------------------------------

+/// Class LLTaskInvFVBridge

+///----------------------------------------------------------------------------

+

+class LLTaskInvFVBridge : public LLFolderViewEventListener

+{

+protected:

+	LLUUID mUUID;

+	std::string mName;

+	mutable std::string mDisplayName;

+	LLPanelObjectInventory* mPanel;

+	U32 mFlags;

+

+	LLInventoryItem* findItem() const;

+

+public:

+	LLTaskInvFVBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name,

+		U32 flags=0);

+	virtual ~LLTaskInvFVBridge( void ) {}

+

+	virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }

+	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }

+

+	static LLTaskInvFVBridge* createObjectBridge(LLPanelObjectInventory* panel,

+												 LLInventoryObject* object);

+	void showProperties();

+	void buyItem();

+	S32 getPrice();

+	static bool commitBuyItem(const LLSD& notification, const LLSD& response);

+

+	// LLFolderViewEventListener functionality

+	virtual const std::string& getName() const;

+	virtual const std::string& getDisplayName() const;

+	virtual PermissionMask getPermissionMask() const { return PERM_NONE; }

+	/*virtual*/ LLAssetType::EType getPreferredType() const { return LLAssetType::AT_NONE; }

+	virtual const LLUUID& getUUID() const { return mUUID; }

+	virtual time_t getCreationDate() const;

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+	virtual void closeItem() {}

+	virtual void previewItem();

+	virtual void selectItem() {}

+	virtual BOOL isItemRenameable() const;

+	virtual BOOL renameItem(const std::string& new_name);

+	virtual BOOL isItemMovable() const;

+	virtual BOOL isItemRemovable();

+	virtual BOOL removeItem();

+	virtual void removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch);

+	virtual void move(LLFolderViewEventListener* parent_listener);

+	virtual BOOL isItemCopyable() const;

+	virtual BOOL copyToClipboard() const;

+	virtual void cutToClipboard();

+	virtual BOOL isClipboardPasteable() const;

+	virtual void pasteFromClipboard();

+	virtual void pasteLinkFromClipboard();

+	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);

+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);

+	virtual BOOL isUpToDate() const { return TRUE; }

+	virtual BOOL hasChildren() const { return FALSE; }

+	virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }

+	// LLDragAndDropBridge functionality

+	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;

+	virtual BOOL dragOrDrop(MASK mask, BOOL drop,

+							EDragAndDropType cargo_type,

+							void* cargo_data);

+};

+

+LLTaskInvFVBridge::LLTaskInvFVBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name,

+	U32 flags):

+	mUUID(uuid),

+	mName(name),

+	mPanel(panel),

+	mFlags(flags)

+{

+

+}

+

+LLInventoryItem* LLTaskInvFVBridge::findItem() const

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(object)

+	{

+		return (LLInventoryItem*)(object->getInventoryObject(mUUID));

+	}

+	return NULL;

+}

+

+void LLTaskInvFVBridge::showProperties()

+{

+	LLFloaterProperties* floater = LLFloaterReg::showTypedInstance<LLFloaterProperties>("properties", mUUID);

+	if (floater)

+	{

+		floater->setObjectID(mPanel->getTaskUUID());

+	}

+}

+

+struct LLBuyInvItemData

+{

+	LLUUID mTaskID;

+	LLUUID mItemID;

+	LLAssetType::EType mType;

+

+	LLBuyInvItemData(const LLUUID& task,

+					 const LLUUID& item,

+					 LLAssetType::EType type) :

+		mTaskID(task), mItemID(item), mType(type)

+	{}

+};

+

+void LLTaskInvFVBridge::buyItem()

+{

+	llinfos << "LLTaskInvFVBridge::buyItem()" << llendl;

+	LLInventoryItem* item = findItem();

+	if(!item || !item->getSaleInfo().isForSale()) return;

+	LLBuyInvItemData* inv = new LLBuyInvItemData(mPanel->getTaskUUID(),

+												 mUUID,

+												 item->getType());

+

+	const LLSaleInfo& sale_info = item->getSaleInfo();

+	const LLPermissions& perm = item->getPermissions();

+	const std::string owner_name; // no owner name currently... FIXME?

+

+	LLViewerObject* obj;

+	if( ( obj = gObjectList.findObject( mPanel->getTaskUUID() ) ) && obj->isAttachment() )

+	{

+		LLNotifications::instance().add("Cannot_Purchase_an_Attachment");

+		llinfos << "Attempt to purchase an attachment" << llendl;

+		delete inv;

+	}

+	else

+	{

+        LLSD args;

+        args["PRICE"] = llformat("%d",sale_info.getSalePrice());

+        args["OWNER"] = owner_name;

+        if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)

+        {

+        	U32 next_owner_mask = perm.getMaskNextOwner();

+        	args["MODIFYPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_MODIFY) ? "PermYes" : "PermNo");

+        	args["COPYPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_COPY) ? "PermYes" : "PermNo");

+        	args["RESELLPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");

+        }

+

+		std::string alertdesc;

+       	switch(sale_info.getSaleType())

+       	{

+       	  case LLSaleInfo::FS_ORIGINAL:

+       		alertdesc = owner_name.empty() ? "BuyOriginalNoOwner" : "BuyOriginal";

+       		break;

+       	  case LLSaleInfo::FS_CONTENTS:

+       		alertdesc = owner_name.empty() ? "BuyContentsNoOwner" : "BuyContents";

+       		break;

+		  case LLSaleInfo::FS_COPY:

+       	  default:

+       		alertdesc = owner_name.empty() ? "BuyCopyNoOwner" : "BuyCopy";

+       		break;

+       	}

+

+		LLSD payload;

+		payload["task_id"] = inv->mTaskID;

+		payload["item_id"] = inv->mItemID;

+		payload["type"] = inv->mType;

+		LLNotifications::instance().add(alertdesc, args, payload, LLTaskInvFVBridge::commitBuyItem);

+	}

+}

+

+S32 LLTaskInvFVBridge::getPrice()

+{

+	LLInventoryItem* item = findItem();

+	if(item)

+	{

+		return item->getSaleInfo().getSalePrice();

+	}

+	else

+	{

+		return -1;

+	}

+}

+

+// static

+bool LLTaskInvFVBridge::commitBuyItem(const LLSD& notification, const LLSD& response)

+{

+	S32 option = LLNotification::getSelectedOption(notification, response);

+	if(0 == option)

+	{

+		LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID());

+		if(!object || !object->getRegion()) return false;

+

+

+		LLMessageSystem* msg = gMessageSystem;

+		msg->newMessageFast(_PREHASH_BuyObjectInventory);

+		msg->nextBlockFast(_PREHASH_AgentData);

+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+		msg->nextBlockFast(_PREHASH_Data);

+		msg->addUUIDFast(_PREHASH_ObjectID, notification["payload"]["task_id"].asUUID());

+		msg->addUUIDFast(_PREHASH_ItemID, notification["payload"]["item_id"].asUUID());

+		msg->addUUIDFast(_PREHASH_FolderID,

+			gInventory.findCategoryUUIDForType((LLAssetType::EType)notification["payload"]["type"].asInteger()));

+		msg->sendReliable(object->getRegion()->getHost());

+	}

+	return false;

+}

+

+const std::string& LLTaskInvFVBridge::getName() const

+{

+	return mName;

+}

+

+const std::string& LLTaskInvFVBridge::getDisplayName() const

+{

+	LLInventoryItem* item = findItem();

+	if(item)

+	{

+		mDisplayName.assign(item->getName());

+

+		const LLPermissions& perm(item->getPermissions());

+		BOOL copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE);

+		BOOL mod  = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE);

+		BOOL xfer = gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE);

+

+		if(!copy)

+		{

+			mDisplayName.append(" (no copy)");

+		}

+		if(!mod)

+		{

+			mDisplayName.append(" (no modify)");

+		}

+		if(!xfer)

+		{

+			mDisplayName.append(" (no transfer)");

+		}

+	}

+

+	return mDisplayName;

+}

+

+// BUG: No creation dates for task inventory

+time_t LLTaskInvFVBridge::getCreationDate() const

+{

+	return 0;

+}

+

+LLUIImagePtr LLTaskInvFVBridge::getIcon() const

+{

+	BOOL item_is_multi = FALSE;

+	if ( mFlags & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS )

+	{

+		item_is_multi = TRUE;

+	}

+

+	return get_item_icon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi );

+}

+

+void LLTaskInvFVBridge::openItem()

+{

+	// no-op.

+	lldebugs << "LLTaskInvFVBridge::openItem()" << llendl;

+}

+

+void LLTaskInvFVBridge::previewItem()

+{

+	openItem();

+}

+

+BOOL LLTaskInvFVBridge::isItemRenameable() const

+{

+	if(gAgent.isGodlike()) return TRUE;

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(object)

+	{

+		LLInventoryItem* item;

+		item = (LLInventoryItem*)(object->getInventoryObject(mUUID));

+		if(item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(),

+										 GP_OBJECT_MANIPULATE, GOD_LIKE))

+		{

+			return TRUE;

+		}

+	}

+	return FALSE;

+}

+

+BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(object)

+	{

+		LLViewerInventoryItem* item = NULL;

+		item = (LLViewerInventoryItem*)object->getInventoryObject(mUUID);

+		if(item && (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(),

+										GP_OBJECT_MANIPULATE, GOD_LIKE)))

+		{

+			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);

+			new_item->rename(new_name);

+			object->updateInventory(

+				new_item,

+				TASK_INVENTORY_ITEM_KEY,

+				false);

+		}

+	}

+	return TRUE;

+}

+

+BOOL LLTaskInvFVBridge::isItemMovable() const

+{

+	//LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	//if(object && (object->permModify() || gAgent.isGodlike()))

+	//{

+	//	return TRUE;

+	//}

+	//return FALSE;

+	return TRUE;

+}

+

+BOOL LLTaskInvFVBridge::isItemRemovable()

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(object

+	   && (object->permModify() || object->permYouOwner()))

+	{

+		return TRUE;

+	}

+	return FALSE;

+}

+

+bool remove_task_inventory_callback(const LLSD& notification, const LLSD& response, LLPanelObjectInventory* panel)

+{

+	S32 option = LLNotification::getSelectedOption(notification, response);

+	LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID());

+	if(option == 0 && object)

+	{

+		// yes

+		LLSD::array_const_iterator list_end = notification["payload"]["inventory_ids"].endArray();

+		for (LLSD::array_const_iterator list_it = notification["payload"]["inventory_ids"].beginArray();

+			list_it != list_end; 

+			++list_it)

+		{

+			object->removeInventory(list_it->asUUID());

+		}

+

+		// refresh the UI.

+		panel->refresh();

+	}

+	return false;

+}

+

+// helper for remove

+// ! REFACTOR ! two_uuids_list_t is also defined in llinevntorybridge.h, but differently.

+typedef std::pair<LLUUID, std::list<LLUUID> > panel_two_uuids_list_t;

+typedef std::pair<LLPanelObjectInventory*, panel_two_uuids_list_t> remove_data_t;

+BOOL LLTaskInvFVBridge::removeItem()

+{

+	if(isItemRemovable() && mPanel)

+	{

+		LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+		if(object)

+		{

+			if(object->permModify())

+			{

+				// just do it.

+				object->removeInventory(mUUID);

+				return TRUE;

+			}

+			else

+			{

+				remove_data_t* data = new remove_data_t;

+				data->first = mPanel;

+				data->second.first = mPanel->getTaskUUID();

+				data->second.second.push_back(mUUID);

+				LLSD payload;

+				payload["task_id"] = mPanel->getTaskUUID();

+				payload["inventory_ids"].append(mUUID);

+				LLNotifications::instance().add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));

+				return FALSE;

+			}

+		}

+	}

+	return FALSE;

+}

+

+void LLTaskInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch)

+{

+	if (!mPanel)

+	{

+		return;

+	}

+

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if (!object)

+	{

+		return;

+	}

+

+	if (!object->permModify())

+	{

+		LLSD payload;

+		payload["task_id"] = mPanel->getTaskUUID();

+		for (S32 i = 0; i < (S32)batch.size(); i++)

+		{

+			LLTaskInvFVBridge* itemp = (LLTaskInvFVBridge*)batch[i];

+			payload["inventory_ids"].append(itemp->getUUID());

+		}

+		LLNotifications::instance().add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));

+		

+	}

+	else

+	{

+		for (S32 i = 0; i < (S32)batch.size(); i++)

+		{

+			LLTaskInvFVBridge* itemp = (LLTaskInvFVBridge*)batch[i];

+

+			if(itemp->isItemRemovable())

+			{

+				// just do it.

+				object->removeInventory(itemp->getUUID());

+			}

+		}

+	}

+}

+

+void LLTaskInvFVBridge::move(LLFolderViewEventListener* parent_listener)

+{

+}

+

+BOOL LLTaskInvFVBridge::isItemCopyable() const

+{

+	LLInventoryItem* item = findItem();

+	if(!item) return FALSE;

+	return gAgent.allowOperation(PERM_COPY, item->getPermissions(),

+								GP_OBJECT_MANIPULATE);

+}

+

+BOOL LLTaskInvFVBridge::copyToClipboard() const

+{

+	return FALSE;

+}

+

+void LLTaskInvFVBridge::cutToClipboard()

+{

+}

+

+BOOL LLTaskInvFVBridge::isClipboardPasteable() const

+{

+	return FALSE;

+}

+

+void LLTaskInvFVBridge::pasteFromClipboard()

+{

+}

+

+void LLTaskInvFVBridge::pasteLinkFromClipboard()

+{

+}

+

+BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const

+{

+	//llinfos << "LLTaskInvFVBridge::startDrag()" << llendl;

+	if(mPanel)

+	{

+		LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+		if(object)

+		{

+			LLInventoryItem* inv = NULL;

+			if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID)))

+			{

+				const LLPermissions& perm = inv->getPermissions();

+				bool can_copy = gAgent.allowOperation(PERM_COPY, perm,

+														GP_OBJECT_MANIPULATE);

+				if (object->isAttachment() && !can_copy)

+				{

+                    //RN: no copy contents of attachments cannot be dragged out

+                    // due to a race condition and possible exploit where

+                    // attached objects do not update their inventory items

+                    // when their contents are manipulated

+                    return FALSE;

+				}

+				if((can_copy && perm.allowTransferTo(gAgent.getID()))

+				   || object->permYouOwner())

+//				   || gAgent.isGodlike())

+

+				{

+					*type = LLAssetType::lookupDragAndDropType(inv->getType());

+

+					*id = inv->getUUID();

+					return TRUE;

+				}

+			}

+		}

+	}

+	return FALSE;

+}

+

+BOOL LLTaskInvFVBridge::dragOrDrop(MASK mask, BOOL drop,

+								   EDragAndDropType cargo_type,

+								   void* cargo_data)

+{

+	//llinfos << "LLTaskInvFVBridge::dragOrDrop()" << llendl;

+	return FALSE;

+}

+

+// virtual

+void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)

+{

+	if (action == "task_buy")

+	{

+		// Check the price of the item.

+		S32 price = getPrice();

+		if (-1 == price)

+		{

+			llwarns << "label_buy_task_bridged_item: Invalid price" << llendl;

+		}

+		else

+		{

+			if (price > 0 && price > gStatusBar->getBalance())

+			{

+				LLFloaterBuyCurrency::buyCurrency("This costs", price);

+			}

+			else

+			{

+				buyItem();

+			}

+		}

+	}

+	else if (action == "task_open")

+	{

+		openItem();

+	}

+	else if (action == "task_properties")

+	{

+		showProperties();

+	}

+}

+

+void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)

+{

+	LLInventoryItem* item = findItem();

+	std::vector<std::string> items;

+	std::vector<std::string> disabled_items;

+	

+	if (!item)

+	{

+		hide_context_entries(menu, items, disabled_items);

+		return;

+	}

+

+	if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),

+							 GP_OBJECT_MANIPULATE)

+	   && item->getSaleInfo().isForSale())

+	{

+		items.push_back(std::string("Task Buy"));

+

+		std::string label= LLTrans::getString("Buy");

+		// Check the price of the item.

+		S32 price = getPrice();

+		if (-1 == price)

+		{

+			llwarns << "label_buy_task_bridged_item: Invalid price" << llendl;

+		}

+		else

+		{

+			std::ostringstream info;

+			info << LLTrans::getString("BuyforL$") << price;

+			label.assign(info.str());

+		}

+

+		const LLView::child_list_t *list = menu.getChildList();

+		LLView::child_list_t::const_iterator itor;

+		for (itor = list->begin(); itor != list->end(); ++itor)

+		{

+			std::string name = (*itor)->getName();

+			LLMenuItemCallGL* menu_itemp = dynamic_cast<LLMenuItemCallGL*>(*itor);

+			if (name == "Task Buy" && menu_itemp)

+			{

+				menu_itemp->setLabel(label);

+			}

+		}

+	}

+	else

+	{

+		items.push_back(std::string("Task Open"));

+		if (!isItemCopyable())

+		{

+			disabled_items.push_back(std::string("Task Open"));

+		}

+	}

+	items.push_back(std::string("Task Properties"));

+	if(isItemRenameable())

+	{

+		items.push_back(std::string("Task Rename"));

+	}

+	if(isItemRemovable())

+	{

+		items.push_back(std::string("Task Remove"));

+	}

+

+	hide_context_entries(menu, items, disabled_items);

+}

+

+

+///----------------------------------------------------------------------------

+/// Class LLTaskFolderBridge

+///----------------------------------------------------------------------------

+

+class LLTaskCategoryBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskCategoryBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual const std::string& getDisplayName() const { return getName(); }

+	virtual BOOL isItemRenameable() const;

+	virtual BOOL renameItem(const std::string& new_name);

+	virtual BOOL isItemRemovable();

+	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);

+	virtual BOOL hasChildren() const;

+	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;

+	virtual BOOL dragOrDrop(MASK mask, BOOL drop,

+							EDragAndDropType cargo_type,

+							void* cargo_data);

+};

+

+LLTaskCategoryBridge::LLTaskCategoryBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskCategoryBridge::getIcon() const

+{

+	return LLUI::getUIImage("Inv_FolderClosed");

+}

+

+BOOL LLTaskCategoryBridge::isItemRenameable() const

+{

+	return FALSE;

+}

+

+BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name)

+{

+	return FALSE;

+}

+

+BOOL LLTaskCategoryBridge::isItemRemovable()

+{

+	return FALSE;

+}

+

+void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)

+{

+	std::vector<std::string> items;

+	std::vector<std::string> disabled_items;

+	items.push_back(std::string("Task Open"));

+	hide_context_entries(menu, items, disabled_items);

+}

+

+BOOL LLTaskCategoryBridge::hasChildren() const

+{

+	// return TRUE if we have or do know know if we have children.

+	// *FIX: For now, return FALSE - we will know for sure soon enough.

+	return FALSE;

+}

+

+BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const

+{

+	//llinfos << "LLTaskInvFVBridge::startDrag()" << llendl;

+	if(mPanel)

+	{

+		LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+		if(object)

+		{

+			LLInventoryItem* inv = NULL;

+			if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID)))

+			{

+				const LLPermissions& perm = inv->getPermissions();

+				bool can_copy = gAgent.allowOperation(PERM_COPY, perm,

+														GP_OBJECT_MANIPULATE);

+				if((can_copy && perm.allowTransferTo(gAgent.getID()))

+				   || object->permYouOwner())

+//				   || gAgent.isGodlike())

+

+				{

+					*type = LLAssetType::lookupDragAndDropType(inv->getType());

+

+					*id = inv->getUUID();

+					return TRUE;

+				}

+			}

+		}

+	}

+	return FALSE;

+}

+

+BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,

+									  EDragAndDropType cargo_type,

+									  void* cargo_data)

+{

+	//llinfos << "LLTaskCategoryBridge::dragOrDrop()" << llendl;

+	BOOL accept = FALSE;

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(object)

+	{

+		switch(cargo_type)

+		{

+		case DAD_CATEGORY:

+			accept = LLToolDragAndDrop::getInstance()->dadUpdateInventoryCategory(object,drop);

+			break;

+		case DAD_TEXTURE:

+		case DAD_SOUND:

+		case DAD_LANDMARK:

+		case DAD_OBJECT:

+		case DAD_NOTECARD:

+		case DAD_CLOTHING:

+		case DAD_BODYPART:

+		case DAD_ANIMATION:

+		case DAD_GESTURE:

+		case DAD_CALLINGCARD:

+			accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);

+			if(accept && drop)

+			{

+				LLToolDragAndDrop::dropInventory(object,

+												 (LLViewerInventoryItem*)cargo_data,

+												 LLToolDragAndDrop::getInstance()->getSource(),

+												 LLToolDragAndDrop::getInstance()->getSourceID());

+			}

+			break;

+		case DAD_SCRIPT:

+			// *HACK: In order to resolve SL-22177, we need to block

+			// drags from notecards and objects onto other

+			// objects. uncomment the simpler version when we have

+			// that right.

+			//accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);

+			if(LLToolDragAndDrop::isInventoryDropAcceptable(

+				   object, (LLViewerInventoryItem*)cargo_data)

+			   && (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource())

+			   && (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource()))

+			{

+				accept = TRUE;

+			}

+			if(accept && drop)

+			{

+				LLViewerInventoryItem* item = (LLViewerInventoryItem*)cargo_data;

+				// rez in the script active by default, rez in

+				// inactive if the control key is being held down.

+				BOOL active = ((mask & MASK_CONTROL) == 0);

+				LLToolDragAndDrop::dropScript(object, item, active,

+											  LLToolDragAndDrop::getInstance()->getSource(),

+											  LLToolDragAndDrop::getInstance()->getSourceID());

+			}

+			break;

+		default:

+			break;

+		}

+	}

+	return accept;

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskTextureBridge

+///----------------------------------------------------------------------------

+

+class LLTaskTextureBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskTextureBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name,

+		LLInventoryType::EType it);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+protected:

+	LLInventoryType::EType mInventoryType;

+};

+

+LLTaskTextureBridge::LLTaskTextureBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name,

+	LLInventoryType::EType it) :

+	LLTaskInvFVBridge(panel, uuid, name),

+	mInventoryType(it)

+{

+}

+

+LLUIImagePtr LLTaskTextureBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_TEXTURE, mInventoryType, 0, FALSE);

+}

+

+void LLTaskTextureBridge::openItem()

+{

+	llinfos << "LLTaskTextureBridge::openItem()" << llendl;

+	LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES);

+	if(preview)

+	{

+		preview->setObjectID(mPanel->getTaskUUID());

+	}

+}

+

+

+///----------------------------------------------------------------------------

+/// Class LLTaskSoundBridge

+///----------------------------------------------------------------------------

+

+class LLTaskSoundBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskSoundBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);

+	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);

+	static void openSoundPreview(void* data);

+};

+

+LLTaskSoundBridge::LLTaskSoundBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskSoundBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);

+}

+

+void LLTaskSoundBridge::openItem()

+{

+	openSoundPreview((void*)this);

+}

+

+void LLTaskSoundBridge::openSoundPreview(void* data)

+{

+	LLTaskSoundBridge* self = (LLTaskSoundBridge*)data;

+	if(!self)

+		return;

+

+	LLPreviewSound* preview = LLFloaterReg::showTypedInstance<LLPreviewSound>("preview_sound", LLSD(self->mUUID), TAKE_FOCUS_YES);

+	if (preview)

+	{

+		preview->setObjectID(self->mPanel->getTaskUUID());

+	}

+}

+

+// virtual

+void LLTaskSoundBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)

+{

+	if (action == "task_play")

+	{

+		LLInventoryItem* item = findItem();

+		if(item)

+		{

+			send_sound_trigger(item->getAssetUUID(), 1.0);

+		}

+	}

+	LLTaskInvFVBridge::performAction(folder, model, action);

+}

+

+void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)

+{

+	LLInventoryItem* item = findItem();

+	if(!item) return;

+	std::vector<std::string> items;

+	std::vector<std::string> disabled_items;

+

+	if(item->getPermissions().getOwner() != gAgent.getID()

+	   && item->getSaleInfo().isForSale())

+	{

+		items.push_back(std::string("Task Buy"));

+

+		std::string label= LLTrans::getString("Buy");

+		// Check the price of the item.

+		S32 price = getPrice();

+		if (-1 == price)

+		{

+			llwarns << "label_buy_task_bridged_item: Invalid price" << llendl;

+		}

+		else

+		{

+			std::ostringstream info;

+			info <<  LLTrans::getString("BuyforL$") << price;

+			label.assign(info.str());

+		}

+

+		const LLView::child_list_t *list = menu.getChildList();

+		LLView::child_list_t::const_iterator itor;

+		for (itor = list->begin(); itor != list->end(); ++itor)

+		{

+			std::string name = (*itor)->getName();

+			LLMenuItemCallGL* menu_itemp = dynamic_cast<LLMenuItemCallGL*>(*itor);

+			if (name == "Task Buy" && menu_itemp)

+			{

+				menu_itemp->setLabel(label);

+			}

+		}

+	}

+	else

+	{

+		items.push_back(std::string("Task Open")); 

+		if (!isItemCopyable())

+		{

+			disabled_items.push_back(std::string("Task Open"));

+		}

+	}

+	items.push_back(std::string("Task Properties"));

+	if(isItemRenameable())

+	{

+		items.push_back(std::string("Task Rename"));

+	}

+	if(isItemRemovable())

+	{

+		items.push_back(std::string("Task Remove"));

+	}

+

+	items.push_back(std::string("Task Play"));

+

+

+	hide_context_entries(menu, items, disabled_items);

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskLandmarkBridge

+///----------------------------------------------------------------------------

+

+class LLTaskLandmarkBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskLandmarkBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+};

+

+LLTaskLandmarkBridge::LLTaskLandmarkBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskLandmarkBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);

+}

+

+

+///----------------------------------------------------------------------------

+/// Class LLTaskCallingCardBridge

+///----------------------------------------------------------------------------

+

+class LLTaskCallingCardBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskCallingCardBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual BOOL isItemRenameable() const;

+	virtual BOOL renameItem(const std::string& new_name);

+};

+

+LLTaskCallingCardBridge::LLTaskCallingCardBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskCallingCardBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, 0, FALSE);

+}

+

+BOOL LLTaskCallingCardBridge::isItemRenameable() const

+{

+	return FALSE;

+}

+

+BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name)

+{

+	return FALSE;

+}

+

+

+///----------------------------------------------------------------------------

+/// Class LLTaskScriptBridge

+///----------------------------------------------------------------------------

+

+class LLTaskScriptBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskScriptBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	//static BOOL enableIfCopyable( void* userdata );

+};

+

+LLTaskScriptBridge::LLTaskScriptBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskScriptBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);

+}

+

+

+class LLTaskLSLBridge : public LLTaskScriptBridge

+{

+public:

+	LLTaskLSLBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual void openItem();

+	virtual BOOL removeItem();

+	//virtual void buildContextMenu(LLMenuGL& menu);

+

+	//static void copyToInventory(void* userdata);

+};

+

+LLTaskLSLBridge::LLTaskLSLBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskScriptBridge(panel, uuid, name)

+{

+}

+

+void LLTaskLSLBridge::openItem()

+{

+	llinfos << "LLTaskLSLBridge::openItem() " << mUUID << llendl;

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(!object || object->isInventoryPending())

+	{

+		return;

+	}

+	LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES);

+	if (preview && (object->permModify() || gAgent.isGodlike()))

+	{

+		preview->setObjectID(mPanel->getTaskUUID());

+	}

+}

+

+BOOL LLTaskLSLBridge::removeItem()

+{

+	LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID));

+	return LLTaskInvFVBridge::removeItem();

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskObjectBridge

+///----------------------------------------------------------------------------

+

+class LLTaskObjectBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskObjectBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+};

+

+LLTaskObjectBridge::LLTaskObjectBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskObjectBridge::getIcon() const

+{

+	BOOL item_is_multi = FALSE;

+	if ( mFlags & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS )

+	{

+		item_is_multi = TRUE;

+	}

+

+	return get_item_icon(LLAssetType::AT_OBJECT, LLInventoryType::IT_OBJECT, 0, item_is_multi);

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskNotecardBridge

+///----------------------------------------------------------------------------

+

+class LLTaskNotecardBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskNotecardBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+	virtual BOOL removeItem();

+};

+

+LLTaskNotecardBridge::LLTaskNotecardBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskNotecardBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);

+}

+

+void LLTaskNotecardBridge::openItem()

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(!object || object->isInventoryPending())

+	{

+		return;

+	}

+	if(object->permModify() || gAgent.isGodlike())

+	{

+		LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(mUUID), TAKE_FOCUS_YES);

+		if (preview)

+		{

+			preview->setObjectID(mPanel->getTaskUUID());

+		}

+	}

+}

+

+BOOL LLTaskNotecardBridge::removeItem()

+{

+	LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID));

+	return LLTaskInvFVBridge::removeItem();

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskGestureBridge

+///----------------------------------------------------------------------------

+

+class LLTaskGestureBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskGestureBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+	virtual BOOL removeItem();

+};

+

+LLTaskGestureBridge::LLTaskGestureBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskGestureBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);

+}

+

+void LLTaskGestureBridge::openItem()

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(!object || object->isInventoryPending())

+	{

+		return;

+	}

+	LLPreviewGesture::show(mUUID, mPanel->getTaskUUID());

+}

+

+BOOL LLTaskGestureBridge::removeItem()

+{

+	// Don't need to deactivate gesture because gestures inside objects can never be active.

+	LLFloaterReg::hideInstance("preview_gesture", LLSD(mUUID));

+	return LLTaskInvFVBridge::removeItem();

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskAnimationBridge

+///----------------------------------------------------------------------------

+

+class LLTaskAnimationBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskAnimationBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name);

+

+	virtual LLUIImagePtr getIcon() const;

+	virtual void openItem();

+	virtual BOOL removeItem();

+};

+

+LLTaskAnimationBridge::LLTaskAnimationBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name) :

+	LLTaskInvFVBridge(panel, uuid, name)

+{

+}

+

+LLUIImagePtr LLTaskAnimationBridge::getIcon() const

+{

+	return get_item_icon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);

+}

+

+void LLTaskAnimationBridge::openItem()

+{

+	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());

+	if(!object || object->isInventoryPending())

+	{

+		return;

+	}

+

+	LLPreviewAnim* preview = LLFloaterReg::showTypedInstance<LLPreviewAnim>("preview_anim", LLSD(mUUID), TAKE_FOCUS_YES);

+	if (preview && (object->permModify() || gAgent.isGodlike()))

+	{

+		preview->setObjectID(mPanel->getTaskUUID());

+	}

+}

+

+BOOL LLTaskAnimationBridge::removeItem()

+{

+	LLFloaterReg::hideInstance("preview_anim", LLSD(mUUID));

+	return LLTaskInvFVBridge::removeItem();

+}

+

+///----------------------------------------------------------------------------

+/// Class LLTaskWearableBridge

+///----------------------------------------------------------------------------

+

+class LLTaskWearableBridge : public LLTaskInvFVBridge

+{

+public:

+	LLTaskWearableBridge(

+		LLPanelObjectInventory* panel,

+		const LLUUID& uuid,

+		const std::string& name,

+		LLAssetType::EType asset_type,

+		U32 flags);

+

+	virtual LLUIImagePtr getIcon() const;

+

+protected:

+	LLAssetType::EType		mAssetType;

+};

+

+LLTaskWearableBridge::LLTaskWearableBridge(

+	LLPanelObjectInventory* panel,

+	const LLUUID& uuid,

+	const std::string& name,

+	LLAssetType::EType asset_type,

+	U32 flags) :

+	LLTaskInvFVBridge(panel, uuid, name, flags),

+	mAssetType( asset_type )

+{

+}

+

+LLUIImagePtr LLTaskWearableBridge::getIcon() const

+{

+	return get_item_icon(mAssetType, LLInventoryType::IT_WEARABLE, mFlags, FALSE );

+}

+

+

+///----------------------------------------------------------------------------

+/// LLTaskInvFVBridge impl

+//----------------------------------------------------------------------------

+

+LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory* panel,

+														 LLInventoryObject* object)

+{

+	LLTaskInvFVBridge* new_bridge = NULL;

+	LLAssetType::EType type = object->getType();

+	LLInventoryItem* item = NULL;

+	switch(type)

+	{

+	case LLAssetType::AT_TEXTURE:

+		item = (LLInventoryItem*)object;

+		new_bridge = new LLTaskTextureBridge(panel,

+											 object->getUUID(),

+											 object->getName(),

+											 item->getInventoryType());

+		break;

+	case LLAssetType::AT_SOUND:

+		new_bridge = new LLTaskSoundBridge(panel,

+										   object->getUUID(),

+										   object->getName());

+		break;

+	case LLAssetType::AT_LANDMARK:

+		new_bridge = new LLTaskLandmarkBridge(panel,

+											  object->getUUID(),

+											  object->getName());

+		break;

+	case LLAssetType::AT_CALLINGCARD:

+		new_bridge = new LLTaskCallingCardBridge(panel,

+												 object->getUUID(),

+												 object->getName());

+		break;

+	case LLAssetType::AT_SCRIPT:

+		// OLD SCRIPTS DEPRECATED - JC

+		llwarns << "Old script" << llendl;

+		//new_bridge = new LLTaskOldScriptBridge(panel,

+		//									   object->getUUID(),

+		//									   object->getName());

+		break;

+	case LLAssetType::AT_OBJECT:

+		new_bridge = new LLTaskObjectBridge(panel,

+											object->getUUID(),

+											object->getName());

+		break;

+	case LLAssetType::AT_NOTECARD:

+		new_bridge = new LLTaskNotecardBridge(panel,

+											  object->getUUID(),

+											  object->getName());

+		break;

+	case LLAssetType::AT_ANIMATION:

+		new_bridge = new LLTaskAnimationBridge(panel,

+											  object->getUUID(),

+											  object->getName());

+		break;

+	case LLAssetType::AT_GESTURE:

+		new_bridge = new LLTaskGestureBridge(panel,

+											  object->getUUID(),

+											  object->getName());

+		break;

+	case LLAssetType::AT_CLOTHING:

+	case LLAssetType::AT_BODYPART:

+		item = (LLInventoryItem*)object;

+		new_bridge = new LLTaskWearableBridge(panel,

+											  object->getUUID(),

+											  object->getName(),

+											  type,

+											  item->getFlags());

+		break;

+	case LLAssetType::AT_CATEGORY:

+	case LLAssetType::AT_FAVORITE:

+		new_bridge = new LLTaskCategoryBridge(panel,

+											  object->getUUID(),

+											  object->getName());

+		break;

+	case LLAssetType::AT_LSL_TEXT:

+		new_bridge = new LLTaskLSLBridge(panel,

+										 object->getUUID(),

+										 object->getName());

+		break;

+	

+		break;

+	default:

+		llinfos << "Unhandled inventory type (llassetstorage.h): "

+				<< (S32)type << llendl;

+		break;

+	}

+	return new_bridge;

+}

+

+

+///----------------------------------------------------------------------------

+/// Class LLPanelObjectInventory

+///----------------------------------------------------------------------------

+

+static LLDefaultChildRegistry::Register<LLPanelObjectInventory> r("panel_inventory_object");

+

+void do_nothing()

+{

+}

+

+// Default constructor

+LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Params& p) :

+	LLPanel(p),

+	mScroller(NULL),

+	mFolders(NULL),

+	mHaveInventory(FALSE),

+	mIsInventoryEmpty(TRUE),

+	mInventoryNeedsUpdate(FALSE)

+{

+	// Setup context menu callbacks

+	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelObjectInventory::doToSelected, this, _2));

+	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLAssetType::AT_TRASH));

+	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLAssetType::AT_LOST_AND_FOUND));

+	mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&do_nothing));

+	mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&do_nothing));

+	mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&do_nothing));

+}

+

+// Destroys the object

+LLPanelObjectInventory::~LLPanelObjectInventory()

+{

+	if (!gIdleCallbacks.deleteFunction(idle, this))

+	{

+		llwarns << "LLPanelObjectInventory::~LLPanelObjectInventory() failed to delete callback" << llendl;

+	}

+}

+

+BOOL LLPanelObjectInventory::postBuild()

+{

+	// clear contents and initialize menus, sets up mFolders

+	reset();

+

+	// Register an idle update callback

+	gIdleCallbacks.addFunction(idle, this);

+

+	return TRUE;

+}

+

+void LLPanelObjectInventory::doToSelected(const LLSD& userdata)

+{

+	mFolders->doToSelected(&gInventory, userdata);

+}

+

+void LLPanelObjectInventory::clearContents()

+{

+	mHaveInventory = FALSE;

+	mIsInventoryEmpty = TRUE;

+	if (LLToolDragAndDrop::getInstance() && LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_WORLD)

+	{

+		LLToolDragAndDrop::getInstance()->endDrag();

+	}

+

+	if( mScroller )

+	{

+		// removes mFolders

+		removeChild( mScroller ); //*TODO: Really shouldn't do this during draw()/refresh()

+		mScroller->die();

+		mScroller = NULL;

+		mFolders = NULL;

+	}

+}

+

+

+void LLPanelObjectInventory::reset()

+{

+	clearContents();

+

+	setBorderVisible(FALSE);

+	

+	mCommitCallbackRegistrar.pushScope(); // push local callbacks

+	

+	LLRect dummy_rect(0, 1, 1, 0);

+	LLFolderView::Params p;

+	p.name = "task inventory";

+	p.task_id = getTaskUUID();

+	p.parent_panel = this;

+	mFolders = LLUICtrlFactory::create<LLFolderView>(p);

+	// this ensures that we never say "searching..." or "no items found"

+	mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS);

+	mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar);

+

+	LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0);

+	LLScrollContainer::Params scroll_p;

+	scroll_p.name("task inventory scroller");

+	scroll_p.rect(scroller_rect);

+	scroll_p.follows.flags(FOLLOWS_ALL);

+	mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_p);

+	addChild(mScroller);

+	mScroller->addChild(mFolders);

+	

+	mFolders->setScrollContainer( mScroller );

+	

+	mCommitCallbackRegistrar.popScope();

+}

+

+void LLPanelObjectInventory::inventoryChanged(LLViewerObject* object,

+										InventoryObjectList* inventory,

+										S32 serial_num,

+										void* data)

+{

+	if(!object) return;

+

+	//llinfos << "invetnory arrived: \n"

+	//		<< " panel UUID: " << panel->mTaskUUID << "\n"

+	//		<< " task  UUID: " << object->mID << llendl;

+	if(mTaskUUID == object->mID)

+	{

+		mInventoryNeedsUpdate = TRUE;

+	}

+

+	// refresh any properties floaters that are hanging around.

+	if(inventory)

+	{

+		for (InventoryObjectList::const_iterator iter = inventory->begin();

+			 iter != inventory->end(); )

+		{

+			LLInventoryObject* item = *iter++;

+			LLFloaterProperties* floater = LLFloaterReg::findTypedInstance<LLFloaterProperties>("properites", item->getUUID());

+			if(floater)

+			{

+				floater->refresh();

+			}

+		}

+	}

+}

+

+void LLPanelObjectInventory::updateInventory()

+{

+	//llinfos << "inventory arrived: \n"

+	//		<< " panel UUID: " << panel->mTaskUUID << "\n"

+	//		<< " task  UUID: " << object->mID << llendl;

+	// We're still interested in this task's inventory.

+	std::set<LLUUID> selected_items;

+	BOOL inventory_has_focus = FALSE;

+	if (mHaveInventory && mFolders->getNumSelectedDescendants())

+	{

+		mFolders->getSelectionList(selected_items);

+		inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders);

+	}

+

+	reset();

+

+	LLViewerObject* objectp = gObjectList.findObject(mTaskUUID);

+	if (objectp)

+	{

+		LLInventoryObject* inventory_root = objectp->getInventoryRoot();

+		InventoryObjectList contents;

+		objectp->getInventoryContents(contents);

+		if (inventory_root)

+		{

+			createFolderViews(inventory_root, contents);

+			mHaveInventory = TRUE;

+			mIsInventoryEmpty = FALSE;

+			mFolders->setEnabled(TRUE);

+		}

+		else

+		{

+			// TODO: create an empty inventory

+			mIsInventoryEmpty = TRUE;

+			mHaveInventory = TRUE;

+		}

+	}

+	else

+	{

+		// TODO: create an empty inventory

+		mIsInventoryEmpty = TRUE;

+		mHaveInventory = TRUE;

+	}

+

+	// restore previous selection

+	std::set<LLUUID>::iterator selection_it;

+	BOOL first_item = TRUE;

+	for (selection_it = selected_items.begin(); selection_it != selected_items.end(); ++selection_it)

+	{

+		LLFolderViewItem* selected_item = mFolders->getItemByID(*selection_it);

+		if (selected_item)

+		{

+			//HACK: "set" first item then "change" each other one to get keyboard focus right

+			if (first_item)

+			{

+				mFolders->setSelection(selected_item, TRUE, inventory_has_focus);

+				first_item = FALSE;

+			}

+			else

+			{

+				mFolders->changeSelection(selected_item, TRUE);

+			}

+		}

+	}

+

+	mFolders->requestArrange();

+	mInventoryNeedsUpdate = FALSE;

+}

+

+// *FIX: This is currently a very expensive operation, because we have

+// to iterate through the inventory one time for each category. This

+// leads to an N^2 based on the category count. This could be greatly

+// speeded with an efficient multimap implementation, but we don't

+// have that in our current arsenal.

+void LLPanelObjectInventory::createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents)

+{

+	if (!inventory_root)

+	{

+		return;

+	}

+	// Create a visible root category.

+	LLTaskInvFVBridge* bridge = NULL;

+	bridge = LLTaskInvFVBridge::createObjectBridge(this, inventory_root);

+	if(bridge)

+	{

+		LLFolderViewFolder* new_folder = NULL;

+		LLFolderViewFolder::Params p;

+		p.name = inventory_root->getName();

+		p.icon = LLUI::getUIImage("Inv_FolderClosed");

+		p.icon_open = LLUI::getUIImage("Inv_FolderOpen");

+		p.root = mFolders;

+		p.listener = bridge;

+		new_folder = LLUICtrlFactory::create<LLFolderViewFolder>(p);

+		new_folder->addToFolder(mFolders, mFolders);

+		new_folder->toggleOpen();

+

+		createViewsForCategory(&contents, inventory_root, new_folder);

+	}

+}

+

+typedef std::pair<LLInventoryObject*, LLFolderViewFolder*> obj_folder_pair;

+

+void LLPanelObjectInventory::createViewsForCategory(InventoryObjectList* inventory, 

+											  LLInventoryObject* parent,

+											  LLFolderViewFolder* folder)

+{

+	// Find all in the first pass

+	LLDynamicArray<obj_folder_pair*> child_categories;

+	LLTaskInvFVBridge* bridge;

+	LLFolderViewItem* view;

+

+	InventoryObjectList::iterator it = inventory->begin();

+	InventoryObjectList::iterator end = inventory->end();

+	for( ; it != end; ++it)

+	{

+		LLInventoryObject* obj = *it;

+

+		if(parent->getUUID() == obj->getParentUUID())

+		{

+			bridge = LLTaskInvFVBridge::createObjectBridge(this, obj);

+			if(!bridge)

+			{

+				continue;

+			}

+			if(LLAssetType::AT_CATEGORY == obj->getType())

+			{

+				LLFolderViewFolder::Params p;

+				p.name = obj->getName();

+				p.icon = LLUI::getUIImage("Inv_FolderClosed");

+				p.icon_open = LLUI::getUIImage("Inv_FolderOpen");

+				p.root = mFolders;

+				p.listener = bridge;

+				view = LLUICtrlFactory::create<LLFolderViewFolder>(p);

+				child_categories.put(new obj_folder_pair(obj,

+														 (LLFolderViewFolder*)view));

+			}

+			else

+			{

+				LLFolderViewItem::Params params;

+				params.name(obj->getName());

+				params.icon(bridge->getIcon());

+				params.creation_date(bridge->getCreationDate());

+				params.root(mFolders);

+				params.listener(bridge);

+				params.rect(LLRect());

+				view = LLUICtrlFactory::create<LLFolderViewItem> (params);

+			}

+			view->addToFolder(folder, mFolders);

+		}

+	}

+

+	// now, for each category, do the second pass

+	for(S32 i = 0; i < child_categories.count(); i++)

+	{

+		createViewsForCategory(inventory, child_categories[i]->first,

+							   child_categories[i]->second );

+		delete child_categories[i];

+	}

+}

+

+void LLPanelObjectInventory::refresh()

+{

+	//llinfos << "LLPanelObjectInventory::refresh()" << llendl;

+	BOOL has_inventory = FALSE;

+	const BOOL non_root_ok = TRUE;

+	LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, non_root_ok);

+	if(node)

+	{

+		LLViewerObject* object = node->getObject();

+		if(object && ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)

+					  || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)))

+		{

+			// determine if we need to make a request. Start with a

+			// default based on if we have inventory at all.

+			BOOL make_request = !mHaveInventory;

+

+			// If the task id is different than what we've stored,

+			// then make the request.

+			if(mTaskUUID != object->mID)

+			{

+				mTaskUUID = object->mID;

+				make_request = TRUE;

+

+				// This is a new object so pre-emptively clear the contents

+				// Otherwise we show the old stuff until the update comes in

+				clearContents();

+

+				// Register for updates from this object,

+				registerVOInventoryListener(object,NULL);

+			}

+

+			// Based on the node information, we may need to dirty the

+			// object inventory and get it again.

+			if(node->mValid)

+			{

+				if(node->mInventorySerial != object->getInventorySerial() || object->isInventoryDirty())

+				{

+					make_request = TRUE;

+				}

+			}

+

+			// do the request if necessary.

+			if(make_request)

+			{

+				requestVOInventory();

+			}

+			has_inventory = TRUE;

+		}

+	}

+	if(!has_inventory)

+	{

+		mTaskUUID = LLUUID::null;

+		removeVOInventoryListener();

+		clearContents();

+	}

+	//llinfos << "LLPanelObjectInventory::refresh() " << mTaskUUID << llendl;

+}

+

+void LLPanelObjectInventory::removeSelectedItem()

+{

+	if(mFolders)

+	{

+		mFolders->removeSelectedItems();

+	}

+}

+

+void LLPanelObjectInventory::startRenamingSelectedItem()

+{

+	if(mFolders)

+	{

+		mFolders->startRenamingSelectedItem();

+	}

+}

+

+void LLPanelObjectInventory::draw()

+{

+	LLPanel::draw();

+

+	if(mIsInventoryEmpty)

+	{

+		if((LLUUID::null != mTaskUUID) && (!mHaveInventory))

+		{

+			LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("LoadingContents"), 0,

+													 (S32)(getRect().getWidth() * 0.5f),

+													 10,

+													 LLColor4( 1, 1, 1, 1 ),

+													 LLFontGL::HCENTER,

+													 LLFontGL::BOTTOM);

+		}

+		else if(mHaveInventory)

+		{

+			LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("NoContents"), 0,

+													 (S32)(getRect().getWidth() * 0.5f),

+													 10,

+													 LLColor4( 1, 1, 1, 1 ),

+													 LLFontGL::HCENTER,

+													 LLFontGL::BOTTOM);

+		}

+	}

+}

+

+void LLPanelObjectInventory::deleteAllChildren()

+{

+	mScroller = NULL;

+	mFolders = NULL;

+	LLView::deleteAllChildren();

+}

+

+BOOL LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)

+{

+	if (mFolders && mHaveInventory)

+	{

+		LLFolderViewItem* folderp = mFolders->getNextFromChild(NULL);

+		if (!folderp)

+		{

+			return FALSE;

+		}

+		// Try to pass on unmodified mouse coordinates

+		S32 local_x = x - mFolders->getRect().mLeft;

+		S32 local_y = y - mFolders->getRect().mBottom;

+

+		if (mFolders->pointInView(local_x, local_y))

+		{

+			return mFolders->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);

+		}

+		else

+		{

+			//force mouse coordinates to be inside folder rectangle

+			return mFolders->handleDragAndDrop(5, 1, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);

+		}

+	}

+	else

+	{

+		return FALSE;

+	}

+}

+

+//static

+void LLPanelObjectInventory::idle(void* user_data)

+{

+	LLPanelObjectInventory* self = (LLPanelObjectInventory*)user_data;

+

+

+	if (self->mInventoryNeedsUpdate)

+	{

+		self->updateInventory();

+	}

+}

diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
new file mode 100644
index 0000000000..7a39d8fabc
--- /dev/null
+++ b/indra/newview/llpanelobjectinventory.h
@@ -0,0 +1,102 @@
+/** 

+ * @file llpanelobjectinventory.h

+ * @brief LLPanelObjectInventory class definition

+ *

+ * $LicenseInfo:firstyear=2002&license=viewergpl$

+ * 

+ * Copyright (c) 2002-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLPANELOBJECTINVENTORY_H

+#define LL_LLPANELOBJECTINVENTORY_H

+

+#include "llvoinventorylistener.h"

+#include "llpanel.h"

+

+#include "llinventory.h"

+

+class LLScrollContainer;

+class LLFolderView;

+class LLFolderViewFolder;

+class LLViewerObject;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLPanelObjectInventory

+//

+// This class represents the panel used to view and control a

+// particular task's inventory.

+//

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLPanelObjectInventory : public LLPanel, public LLVOInventoryListener

+{

+public:

+	// dummy param block for template registration purposes

+	struct Params : public LLPanel::Params {};

+

+	LLPanelObjectInventory(const Params&);

+	virtual ~LLPanelObjectInventory();

+	

+	virtual BOOL postBuild();

+

+	void doToSelected(const LLSD& userdata);

+	

+	void refresh();

+	const LLUUID& getTaskUUID() { return mTaskUUID;}

+	void removeSelectedItem();

+	void startRenamingSelectedItem();

+

+	LLFolderView* getRootFolder() const { return mFolders; }

+

+	virtual void draw();

+	virtual void deleteAllChildren();

+	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);

+	

+	static void idle(void* user_data);

+

+protected:

+	void reset();

+	/*virtual*/ void inventoryChanged(LLViewerObject* object,

+								 InventoryObjectList* inventory,

+								 S32 serial_num,

+								 void* user_data);

+	void updateInventory();

+	void createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents);

+	void createViewsForCategory(InventoryObjectList* inventory,

+								LLInventoryObject* parent,

+								LLFolderViewFolder* folder);

+	void clearContents();

+

+private:

+	LLScrollContainer* mScroller;

+	LLFolderView* mFolders;

+	

+	LLUUID mTaskUUID;

+	BOOL mHaveInventory;

+	BOOL mIsInventoryEmpty;

+	BOOL mInventoryNeedsUpdate;

+};

+

+#endif // LL_LLPANELOBJECTINVENTORY_H

diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 4ac109bf3d..5a70842a73 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -57,7 +57,6 @@
 #include "llfirstuse.h"
 #include "llfocusmgr.h"
 #include "llmanipscale.h"
-#include "llpanelinventory.h"
 #include "llpreviewscript.h"
 #include "llresmgr.h"
 #include "llselectmgr.h"
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h
index 9d197aafa5..7bc935f986 100644
--- a/indra/newview/llpanelvolume.h
+++ b/indra/newview/llpanelvolume.h
@@ -45,7 +45,6 @@ class LLUICtrl;
 class LLButton;
 class LLViewerObject;
 class LLComboBox;
-class LLPanelInventory;
 class LLColorSwatchCtrl;
 
 class LLPanelVolume : public LLPanel
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp
index b3b4857727..83443687c9 100644
--- a/indra/newview/llplacesinventorybridge.cpp
+++ b/indra/newview/llplacesinventorybridge.cpp
@@ -38,6 +38,7 @@
 
 #include "llfloaterinventory.h" // for LLInventoryPanel
 #include "llfolderview.h" // for FIRST_SELECTED_ITEM
+#include "llinventorypanel.h"
 
 
 static const std::string LANDMARKS_INVENTORY_LIST_NAME("landmarks_list");
@@ -83,7 +84,7 @@ void LLPlacesLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		// they should be synchronized with Places/My Landmarks/Gear menu. See EXT-1601 
 	}
 
-	hideContextEntries(menu, items, disabled_items);
+	hide_context_entries(menu, items, disabled_items);
 }
 
 
@@ -116,7 +117,7 @@ void LLPlacesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		// repeat parent functionality
  		sSelf = this; // necessary for "New Folder" functionality
 
-		hideContextEntries(menu, items, disabled_items);
+		hide_context_entries(menu, items, disabled_items);
 	}
 }
 
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index ac7abf1448..a6f5465e1b 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -89,7 +89,6 @@
 #include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llappviewer.h"
-#include "llpanelinventory.h"
 
 const std::string HELLO_LSL =
 	"default\n"
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
new file mode 100644
index 0000000000..8a1b97695d
--- /dev/null
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -0,0 +1,276 @@
+/**

+ * @file LLSidepanelInventory.cpp

+ * @brief Side Bar "Inventory" panel

+ *

+ * $LicenseInfo:firstyear=2009&license=viewergpl$

+ *

+ * Copyright (c) 2004-2009, Linden Research, Inc.

+ *

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ *

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ *

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ *

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "llsidepanelinventory.h"

+

+#include "llagent.h"

+#include "llbutton.h"

+#include "llinventorybridge.h"

+#include "llinventorypanel.h"

+#include "llpanelmaininventory.h"

+#include "llsidepanelobjectinfo.h"

+#include "lltabcontainer.h"

+

+static const S32 LANDMARK_FOLDERS_MENU_WIDTH = 250;

+static const std::string AGENT_INFO_TYPE			= "agent";

+static const std::string CREATE_LANDMARK_INFO_TYPE	= "create_landmark";

+static const std::string LANDMARK_INFO_TYPE			= "landmark";

+static const std::string REMOTE_PLACE_INFO_TYPE		= "remote_place";

+static const std::string TELEPORT_HISTORY_INFO_TYPE	= "teleport_history";

+

+// Helper functions

+static void setAllChildrenVisible(LLView* view, BOOL visible);

+

+static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_inventory");

+

+LLSidepanelInventory::LLSidepanelInventory()

+	:	LLPanel(),

+		mSidepanelObjectInfo(NULL),

+		mItem(NULL)

+{

+

+	//LLUICtrlFactory::getInstance()->buildPanel(this, "panel_inventory.xml"); // Called from LLRegisterPanelClass::defaultPanelClassBuilder()

+}

+

+LLSidepanelInventory::~LLSidepanelInventory()

+{

+}

+

+BOOL LLSidepanelInventory::postBuild()

+{

+	mInfoBtn = getChild<LLButton>("info_btn");

+	mInfoBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onInfoButtonClicked, this));

+

+	mShareBtn = getChild<LLButton>("share_btn");

+	mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));

+

+	mShareBtn = getChild<LLButton>("share_btn");

+	mShareBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onShareButtonClicked, this));

+

+	mWearBtn = getChild<LLButton>("wear_btn");

+	mWearBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onWearButtonClicked, this));

+

+	mPlayBtn = getChild<LLButton>("play_btn");

+	mPlayBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onPlayButtonClicked, this));

+

+	mTeleportBtn = getChild<LLButton>("teleport_btn");

+	mTeleportBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onTeleportButtonClicked, this));

+

+	mOverflowBtn = getChild<LLButton>("overflow_btn");

+	mOverflowBtn->setClickedCallback(boost::bind(&LLSidepanelInventory::onOverflowButtonClicked, this));

+

+	mTabContainer = getChild<LLTabContainer>("Inventory Tabs");

+	mSidepanelObjectInfo = getChild<LLSidepanelObjectInfo>("sidepanel_object_info");

+

+	mPanelMainInventory = getChild<LLPanelMainInventory>("panel_main_inventory");

+	mPanelMainInventory->setSelectCallback(boost::bind(&LLSidepanelInventory::onSelectionChange, this, _1, _2));

+

+	LLButton* back_btn = mSidepanelObjectInfo->getChild<LLButton>("back_btn");

+	back_btn->setClickedCallback(boost::bind(&LLSidepanelInventory::onBackButtonClicked, this));

+

+	return TRUE;

+}

+

+void LLSidepanelInventory::onOpen(const LLSD& key)

+{

+	if(mSidepanelObjectInfo == NULL || key.size() == 0)

+		return;

+

+	mItem = NULL;

+

+	LLInventoryItem* item = gInventory.getItem(key["id"].asUUID());

+	if (!item)

+	{

+		return;

+	}

+	setItem(item);

+	toggleObjectInfoPanel(TRUE);

+}

+

+void LLSidepanelInventory::setItem(LLInventoryItem* item)

+{

+	if (!mSidepanelObjectInfo || !item)

+		return;

+

+	mItem = item;

+

+	LLAssetType::EType item_type = mItem->getActualType();

+	if (item_type == LLAssetType::AT_LINK)

+	{

+		mItem = gInventory.getItem(mItem->getLinkedUUID());

+		if (mItem.isNull())

+			return;

+	}

+

+	// Check if item is in agent's inventory and he has the permission to modify it.

+	BOOL is_object_editable = gInventory.isObjectDescendentOf(mItem->getUUID(), gInventory.getRootFolderID()) &&

+		mItem->getPermissions().allowModifyBy(gAgent.getID());

+

+	mInfoBtn->setEnabled(is_object_editable);

+	// mSaveBtn->setEnabled(is_object_editable);

+

+	mSidepanelObjectInfo->displayItemInfo(mItem);

+}

+

+void LLSidepanelInventory::onInfoButtonClicked()

+{

+	LLInventoryItem *item = getSelectedItem();

+	if (item)

+	{

+		setItem(item);

+		toggleObjectInfoPanel(TRUE);

+	}

+}

+

+void LLSidepanelInventory::onShareButtonClicked()

+{

+}

+

+void LLSidepanelInventory::performActionOnSelection(const std::string &action)

+{

+	LLInventoryPanel *panel = mPanelMainInventory->getActivePanel();

+	LLFolderViewItem* current_item = panel->getRootFolder()->getCurSelectedItem();

+	if (!current_item)

+	{

+		return;

+	}

+	current_item->getListener()->performAction(panel->getRootFolder(), panel->getModel(), action);

+}

+

+void LLSidepanelInventory::onWearButtonClicked()

+{

+	performActionOnSelection("wear");

+	performActionOnSelection("attach");

+}

+

+void LLSidepanelInventory::onPlayButtonClicked()

+{

+	performActionOnSelection("activate");

+}

+

+void LLSidepanelInventory::onTeleportButtonClicked()

+{

+	performActionOnSelection("teleport");

+}

+

+void LLSidepanelInventory::onOverflowButtonClicked()

+{

+}

+

+void LLSidepanelInventory::onBackButtonClicked()

+{

+	if (!mSidepanelObjectInfo)

+		return;

+	

+	toggleObjectInfoPanel(FALSE);

+

+	

+	updateVerbs();

+}

+

+void LLSidepanelInventory::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action)

+{

+	updateVerbs();

+}

+

+void LLSidepanelInventory::toggleObjectInfoPanel(BOOL visible)

+{

+	if (!mSidepanelObjectInfo)

+		return;

+

+	mSidepanelObjectInfo->setVisible(visible);

+	mTabContainer->setVisible(!visible);

+

+	if (visible)

+	{

+		mSidepanelObjectInfo->reset();

+		mSidepanelObjectInfo->setEditMode(FALSE);

+

+		LLRect rect = getRect();

+		LLRect new_rect = LLRect(rect.mLeft, rect.mTop, rect.mRight, mTabContainer->getRect().mBottom);

+		mSidepanelObjectInfo->reshape(new_rect.getWidth(),new_rect.getHeight());

+	}

+}

+

+void LLSidepanelInventory::updateVerbs()

+{

+	mInfoBtn->setEnabled(FALSE);

+	mShareBtn->setEnabled(FALSE);

+

+	mWearBtn->setVisible(FALSE);

+	mWearBtn->setEnabled(FALSE);

+	mPlayBtn->setVisible(FALSE);

+	mPlayBtn->setEnabled(FALSE);

+ 	mTeleportBtn->setVisible(FALSE);

+ 	mTeleportBtn->setEnabled(FALSE);

+	

+	const LLInventoryItem *item = getSelectedItem();

+	if (!item)

+		return;

+

+	mInfoBtn->setEnabled(TRUE);

+	mShareBtn->setEnabled(TRUE);

+

+	switch(item->getInventoryType())

+	{

+		case LLInventoryType::IT_WEARABLE:

+		case LLInventoryType::IT_OBJECT:

+		case LLInventoryType::IT_ATTACHMENT:

+			mWearBtn->setVisible(TRUE);

+			mWearBtn->setEnabled(TRUE);

+			break;

+		case LLInventoryType::IT_SOUND:

+		case LLInventoryType::IT_GESTURE:

+		case LLInventoryType::IT_ANIMATION:

+			mPlayBtn->setVisible(TRUE);

+			mPlayBtn->setEnabled(TRUE);

+			break;

+		case LLInventoryType::IT_LANDMARK:

+			mTeleportBtn->setVisible(TRUE);

+			mTeleportBtn->setEnabled(TRUE);

+			break;

+		default:

+			break;

+	}

+}

+

+LLInventoryItem *LLSidepanelInventory::getSelectedItem()

+{

+	LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();

+	if (!current_item)

+	{

+		return NULL;

+	}

+	const LLUUID &item_id = current_item->getListener()->getUUID();

+	LLInventoryItem *item = gInventory.getItem(item_id);

+	return item;

+}

diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
new file mode 100644
index 0000000000..784f5e43b7
--- /dev/null
+++ b/indra/newview/llsidepanelinventory.h
@@ -0,0 +1,85 @@
+/** 

+ * @file LLSidepanelInventory.h

+ * @brief Side Bar "Inventory" panel

+ *

+ * $LicenseInfo:firstyear=2009&license=viewergpl$

+ * 

+ * Copyright (c) 2004-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLSIDEPANELINVENTORY_H

+#define LL_LLSIDEPANELINVENTORY_H

+

+#include "llpanel.h"

+

+class LLInventoryItem;

+class LLSidepanelObjectInfo;

+class LLTabContainer;

+class LLPanelMainInventory;

+class LLFolderViewItem;

+

+class LLSidepanelInventory : public LLPanel

+{

+public:

+	LLSidepanelInventory();

+	virtual ~LLSidepanelInventory();

+

+	/*virtual*/ BOOL postBuild();

+	/*virtual*/ void onOpen(const LLSD& key);

+

+	void setItem(LLInventoryItem* item);

+

+protected:

+	LLInventoryItem *getSelectedItem();

+	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);

+	void onTabSelected();

+	void toggleObjectInfoPanel(BOOL visible);

+	void updateVerbs();

+	void performActionOnSelection(const std::string &action);

+

+	LLTabContainer*				mTabContainer;

+	LLSidepanelObjectInfo*		mSidepanelObjectInfo;

+	LLPanelMainInventory*		mPanelMainInventory;

+

+	void 						onInfoButtonClicked();

+	void 						onShareButtonClicked();

+	void 						onWearButtonClicked();

+	void 						onPlayButtonClicked();

+	void 						onTeleportButtonClicked();

+	void 						onOverflowButtonClicked();

+	void 						onBackButtonClicked();

+	

+	LLButton*					mInfoBtn;

+	LLButton*					mShareBtn;

+	LLButton*					mWearBtn;

+	LLButton*					mPlayBtn;

+	LLButton*					mTeleportBtn;

+	LLButton*					mOverflowBtn;

+

+	// Pointer to a item

+	LLPointer<LLInventoryItem>	mItem;

+};

+

+#endif //LL_LLSIDEPANELINVENTORY_H

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 4940d9b5bb..50ebc205a9 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -47,7 +47,9 @@
 #include "llfolderview.h"
 #include "llfoldervieweventlistener.h"
 #include "llinventory.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 #include "lllineeditor.h"
 #include "llui.h"
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index e26a0776ff..e78737fe0d 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -38,6 +38,7 @@
 
 #include "llbutton.h"
 #include "lliconctrl.h"
+#include "llinventoryfunctions.h"
 #include "llnotify.h"
 #include "lltextbox.h"
 
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 366e5602bd..470739baa9 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -38,6 +38,7 @@
 
 #include "llagent.h"
 #include "llfoldertype.h"
+#include "llfolderview.h"
 #include "llviewercontrol.h"
 #include "llconsole.h"
 #include "llinventorymodel.h"
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 864cf9d57b..a2b0923df0 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -50,6 +50,7 @@
 #include "llfocusmgr.h"
 #include "llfontgl.h"
 #include "llinstantmessage.h"
+#include "llinventorypanel.h"
 #include "llpermissionsflags.h"
 #include "llrect.h"
 #include "llsecondlifeurls.h"
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8b7df63884..8b66341d52 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -89,6 +89,7 @@
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
 #include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 #include "llmenugl.h"
 #include "llmoveview.h"
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index c322d2aebb..4d9cac3672 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -396,6 +396,10 @@
   <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
   <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" />
   <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
+  <texture name="TabIcon_Inventory_Large" file_name="taskpanel/TabIcon_Inventory_Large.png" preload="false" />
+  <texture name="TabIcon_Inventory_Off" file_name="taskpanel/TabIcon_Inventory_Off.png" preload="false" />
+  <texture name="TabIcon_Inventory_Over" file_name="taskpanel/TabIcon_Inventory_Over.png" preload="false" />
+  <texture name="TabIcon_Inventory_Selected" file_name="taskpanel/TabIcon_Inventory_Selected.png" preload="false" />
   <texture name="TabIcon_Me_Large" file_name="taskpanel/TabIcon_Me_Large.png" preload="false" />
   <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
   <texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index dfa6c83b4e..6da4f9e6f3 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -1,434 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- auto_tile="true"
- can_resize="true"
- height="563"
- layout="topleft"
- min_height="150"
- min_width="240"
- name="Inventory"
- help_topic="inventory"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- title="Inventory"
- width="467">
-    <floater.string
-     name="Title">
-        Inventory
-    </floater.string>
-    <floater.string
-     name="TitleFetching">
-        Inventory (Fetching [ITEM_COUNT] Items...) [FILTER]
-    </floater.string>
-    <floater.string
-     name="TitleCompleted">
-        Inventory ([ITEM_COUNT] Items) [FILTER]
-    </floater.string>
-    <floater.string
-     name="Fetched">
-        Fetched
-    </floater.string>
-    <filter_editor
-     search_button_visible="false"
-     text_pad_left="12"
-     follows="left|top|right"
-     height="16"
-     label="Type here to search"
-     layout="topleft"
-     left="6"
-     name="inventory search editor"
-     top="34"
-     width="455" />
-    <tab_container
-     follows="all"
-     height="508"
-     halign="center"
-     layout="topleft"
-     left_delta="-4"
-     name="inventory filter tabs"
-     tab_position="top"
-     tab_height="20"
-     top_pad="5"
-     width="463">
-        <inventory_panel
-         follows="left|top|right|bottom"
-         height="491"
-         label="All Items"
-         layout="topleft"
-         left="1"
-         name="All Items"
-         top="16"
-         width="461" />
-        <inventory_panel
-         follows="left|top|right|bottom"
-         height="491"
-         label="Recent Items"
-         layout="topleft"
-         left_delta="0"
-         name="Recent Items"
-         top_delta="0"
-         width="461" />
-    </tab_container>
-    <menu_bar
-     bg_visible="false"
-     follows="left|top|right"
-     height="18"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="Inventory Menu"
-     top_delta="-38"
-     width="461">
-        <menu
-         height="101"
-         label="File"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="File"
-         tear_off="true"
-         top="-117"
-         width="128">
-            <menu_item_call
-             label="Open"
-             layout="topleft"
-             name="Open">
-                <menu_item_call.on_click
-                 function="Inventory.DoToSelected"
-                 parameter="open" />
-            </menu_item_call>
-            <menu
-             create_jump_keys="true"
-             label="Upload"
-             layout="topleft"
-             name="upload"
-             tear_off="true">
-                <menu_item_call
-                 label="Image (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Image"
-                 shortcut="control|U">
-                    <menu_item_call.on_click
-                     function="File.UploadImage"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Sound (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Sound">
-                    <menu_item_call.on_click
-                     function="File.UploadSound"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Animation (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Animation">
-                    <menu_item_call.on_click
-                     function="File.UploadAnim"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Bulk (L$[COST] per file)..."
-                 layout="topleft"
-                 name="Bulk Upload">
-                    <menu_item_call.on_click
-                     function="File.UploadBulk"
-                     parameter="" />
-                </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
-            </menu>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="New Window"
-             layout="topleft"
-             name="New Window">
-                <menu_item_call.on_click
-                 function="Inventory.NewWindow" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator2" />
-            <menu_item_call
-             label="Show Filters"
-             layout="topleft"
-             name="Show Filters">
-                <menu_item_call.on_click
-                 function="Inventory.ShowFilters" />
-            </menu_item_call>
-            <menu_item_call
-             label="Reset Filters"
-             layout="topleft"
-             name="Reset Current">
-                <menu_item_call.on_click
-                 function="Inventory.ResetFilter" />
-            </menu_item_call>
-            <menu_item_call
-             label="Close All Folders"
-             layout="topleft"
-             name="Close All Folders">
-                <menu_item_call.on_click
-                 function="Inventory.CloseAllFolders" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator3" />
-            <menu_item_call
-             label="Empty Trash"
-             layout="topleft"
-             name="Empty Trash">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyTrash" />
-            </menu_item_call>
-            <menu_item_call
-             label="Empty Lost And Found"
-             layout="topleft"
-             name="Empty Lost And Found">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyLostAndFound" />
-            </menu_item_call>
-        </menu>
-        <menu
-         height="121"
-         label="Create"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Create"
-         tear_off="true"
-         top="-201"
-         width="121">
-            <menu_item_call
-             label="New Folder"
-             layout="topleft"
-             name="New Folder">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="category" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Script"
-             layout="topleft"
-             name="New Script">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="lsl" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Note"
-             layout="topleft"
-             name="New Note">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="notecard" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Gesture"
-             layout="topleft"
-             name="New Gesture">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="gesture" />
-            </menu_item_call>
-            <menu
-             height="175"
-             label="New Clothes"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Clothes"
-             top_pad="514"
-             width="125">
-                <menu_item_call
-                 label="New Shirt"
-                 layout="topleft"
-                 name="New Shirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Pants"
-                 layout="topleft"
-                 name="New Pants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="pants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Shoes"
-                 layout="topleft"
-                 name="New Shoes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shoes" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Socks"
-                 layout="topleft"
-                 name="New Socks">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="socks" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Jacket"
-                 layout="topleft"
-                 name="New Jacket">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="jacket" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skirt"
-                 layout="topleft"
-                 name="New Skirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Gloves"
-                 layout="topleft"
-                 name="New Gloves">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="gloves" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Undershirt"
-                 layout="topleft"
-                 name="New Undershirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="undershirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Underpants"
-                 layout="topleft"
-                 name="New Underpants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="underpants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Alpha"
-                 layout="topleft"
-                 name="New Alpha">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="alpha" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Tattoo"
-                 layout="topleft"
-                 name="New Tattoo">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="tattoo" />
-                </menu_item_call>
-            </menu>
-            <menu
-             height="85"
-             label="New Body Parts"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Body Parts"
-             top_pad="514"
-             width="118">
-                <menu_item_call
-                 label="New Shape"
-                 layout="topleft"
-                 name="New Shape">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shape" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skin"
-                 layout="topleft"
-                 name="New Skin">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skin" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Hair"
-                 layout="topleft"
-                 name="New Hair">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="hair" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Eyes"
-                 layout="topleft"
-                 name="New Eyes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="eyes" />
-                </menu_item_call>
-            </menu>
-        </menu>
-        <menu
-         height="49"
-         label="Sort"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Sort"
-         tear_off="true"
-         top="-113"
-         width="118">
-            <menu_item_check
-             control_name="Inventory.SortByName"
-             label="By Name"
-             layout="topleft"
-             name="By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="name" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SortByDate"
-             label="By Date"
-             layout="topleft"
-             name="By Date">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="date" />
-            </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_check
-             control_name="Inventory.FoldersAlwaysByName"
-             label="Folders Always By Name"
-             layout="topleft"
-             name="Folders Always By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="foldersalwaysbyname" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SystemFoldersToTop"
-             label="System Folders To Top"
-             layout="topleft"
-             name="System Folders To Top">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="systemfolderstotop" />
-            </menu_item_check>
-        </menu>
-    </menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ auto_tile="true"

+ can_resize="true"

+ height="563"

+ layout="topleft"

+ min_height="150"

+ min_width="240"

+ name="Inventory"

+ help_topic="inventory"

+ save_rect="true"

+ save_visibility="true"

+ single_instance="true"

+ title="Inventory"

+ width="467">

+    <floater.string

+     name="Title">

+        Inventory

+    </floater.string>

+    <floater.string

+     name="TitleFetching">

+        Inventory (Fetching [ITEM_COUNT] Items...) [FILTER]

+    </floater.string>

+    <floater.string

+     name="TitleCompleted">

+        Inventory ([ITEM_COUNT] Items) [FILTER]

+    </floater.string>

+    <floater.string

+     name="Fetched">

+        Fetched

+    </floater.string>

+<panel

+     bottom="560"

+	 class="panel_main_inventory"

+	 filename="panel_main_inventory.xml"

+	 follows="all"

+	 layout="topleft"

+	 left="0"

+	 label="Inventory Panel"

+	 name="Inventory Panel"

+	 top="15"

+	 width="467">

+</panel>

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index cc50f43339..af8aadf0e0 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -26,7 +26,7 @@
      width="284">
         [DESC]:
     </text>
-    <panel_inventory
+    <panel_inventory_object
      background_visible="false"
      draw_border="false"
      follows="all"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ca12538302..845f68a7ee 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2793,7 +2793,7 @@
              left_pad="8"
              name="button permissions"
              width="130" />
-            <panel_inventory
+            <panel_inventory_object
              follows="left|top"
              height="210"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
new file mode 100644
index 0000000000..b6218ad932
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+ background_visible="true"

+ follows="all"

+ height="400"

+ label="Things"

+ layout="topleft"

+ min_height="350"

+ min_width="240"

+ name="inventory panel"

+ width="333">

+    <panel.string

+     name="Title">

+        Things

+    </panel.string>

+    <filter_editor

+     text_pad_left="12"

+     follows="left|top|right"

+	 font="SanSerif"

+     height="20"

+     label="Filter"

+     layout="topleft"

+     left="15"

+     name="inventory search editor"

+     top="34"

+     width="300" />

+    <tab_container

+     follows="left|top|right|bottom"

+     height="508"

+     layout="topleft"

+     left_delta="-4"

+     name="inventory filter tabs"

+     tab_position="top"

+     top_pad="4"

+     width="463">

+        <inventory_panel

+         follows="left|top|right|bottom"

+         height="491"

+         label="All Items"

+         layout="topleft"

+         left="1"

+         name="All Items"

+         top="16"

+         width="461" />

+        <inventory_panel

+         follows="left|top|right|bottom"

+         height="491"

+         label="Recent Items"

+         layout="topleft"

+         left_delta="0"

+         name="Recent Items"

+         top_delta="0"

+         width="461" />

+    </tab_container>

+    <menu_bar

+     bg_visible="false"

+     follows="left|top|right"

+     height="18"

+     layout="topleft"

+     left_delta="0"

+     mouse_opaque="false"

+     name="Inventory Menu"

+     top_delta="-38"

+     width="461">

+        <menu

+         height="101"

+         label="File"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="File"

+         tear_off="true"

+         top="-117"

+         width="128">

+            <menu_item_call

+             label="Open"

+             layout="topleft"

+             name="Open">

+                <menu_item_call.on_click

+                 function="Inventory.DoToSelected"

+                 parameter="open" />

+            </menu_item_call>

+            <menu

+             create_jump_keys="true"

+             label="Upload"

+             layout="topleft"

+             name="upload"

+             tear_off="true">

+                <menu_item_call

+                 label="Image (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Image"

+                 shortcut="control|U">

+                    <menu_item_call.on_click

+                     function="File.UploadImage"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Sound (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Sound">

+                    <menu_item_call.on_click

+                     function="File.UploadSound"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Animation (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Animation">

+                    <menu_item_call.on_click

+                     function="File.UploadAnim"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Bulk (L$[COST] per file)..."

+                 layout="topleft"

+                 name="Bulk Upload">

+                    <menu_item_call.on_click

+                     function="File.UploadBulk"

+                     parameter="" />

+                </menu_item_call>

+                <menu_item_separator

+                 layout="topleft" />

+            </menu>

+            <menu_item_separator

+             layout="topleft" />

+            <menu_item_call

+             label="New Window"

+             layout="topleft"

+             name="New Window">

+                <menu_item_call.on_click

+                 function="Inventory.NewWindow" />

+            </menu_item_call>

+            <menu_item_separator

+             layout="topleft"

+             name="separator2" />

+            <menu_item_call

+             label="Show Filters"

+             layout="topleft"

+             name="Show Filters">

+                <menu_item_call.on_click

+                 function="Inventory.ShowFilters" />

+            </menu_item_call>

+            <menu_item_call

+             label="Reset Filters"

+             layout="topleft"

+             name="Reset Current">

+                <menu_item_call.on_click

+                 function="Inventory.ResetFilter" />

+            </menu_item_call>

+            <menu_item_call

+             label="Close All Folders"

+             layout="topleft"

+             name="Close All Folders">

+                <menu_item_call.on_click

+                 function="Inventory.CloseAllFolders" />

+            </menu_item_call>

+            <menu_item_separator

+             layout="topleft"

+             name="separator3" />

+            <menu_item_call

+             label="Empty Trash"

+             layout="topleft"

+             name="Empty Trash">

+                <menu_item_call.on_click

+                 function="Inventory.EmptyTrash" />

+            </menu_item_call>

+            <menu_item_call

+             label="Empty Lost And Found"

+             layout="topleft"

+             name="Empty Lost And Found">

+                <menu_item_call.on_click

+                 function="Inventory.EmptyLostAndFound" />

+            </menu_item_call>

+        </menu>

+        <menu

+         height="121"

+         label="Create"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="Create"

+         tear_off="true"

+         top="-201"

+         width="121">

+            <menu_item_call

+             label="New Folder"

+             layout="topleft"

+             name="New Folder">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="category" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Script"

+             layout="topleft"

+             name="New Script">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="lsl" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Note"

+             layout="topleft"

+             name="New Note">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="notecard" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Gesture"

+             layout="topleft"

+             name="New Gesture">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="gesture" />

+            </menu_item_call>

+            <menu

+             height="175"

+             label="New Clothes"

+             layout="topleft"

+             left_delta="0"

+             mouse_opaque="false"

+             name="New Clothes"

+             top_pad="514"

+             width="125">

+                <menu_item_call

+                 label="New Shirt"

+                 layout="topleft"

+                 name="New Shirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Pants"

+                 layout="topleft"

+                 name="New Pants">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="pants" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Shoes"

+                 layout="topleft"

+                 name="New Shoes">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shoes" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Socks"

+                 layout="topleft"

+                 name="New Socks">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="socks" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Jacket"

+                 layout="topleft"

+                 name="New Jacket">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="jacket" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Skirt"

+                 layout="topleft"

+                 name="New Skirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="skirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Gloves"

+                 layout="topleft"

+                 name="New Gloves">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="gloves" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Undershirt"

+                 layout="topleft"

+                 name="New Undershirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="undershirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Underpants"

+                 layout="topleft"

+                 name="New Underpants">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="underpants" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Alpha"

+                 layout="topleft"

+                 name="New Alpha">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="alpha" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Tattoo"

+                 layout="topleft"

+                 name="New Tattoo">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="tattoo" />

+                </menu_item_call>

+            </menu>

+            <menu

+             height="85"

+             label="New Body Parts"

+             layout="topleft"

+             left_delta="0"

+             mouse_opaque="false"

+             name="New Body Parts"

+             top_pad="514"

+             width="118">

+                <menu_item_call

+                 label="New Shape"

+                 layout="topleft"

+                 name="New Shape">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shape" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Skin"

+                 layout="topleft"

+                 name="New Skin">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="skin" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Hair"

+                 layout="topleft"

+                 name="New Hair">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="hair" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Eyes"

+                 layout="topleft"

+                 name="New Eyes">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="eyes" />

+                </menu_item_call>

+            </menu>

+        </menu>

+        <menu

+         height="49"

+         label="Sort"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="Sort"

+         tear_off="true"

+         top="-113"

+         width="118">

+            <menu_item_check

+             control_name="Inventory.SortByName"

+             label="By Name"

+             layout="topleft"

+             name="By Name">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="name" />

+            </menu_item_check>

+            <menu_item_check

+             control_name="Inventory.SortByDate"

+             label="By Date"

+             layout="topleft"

+             name="By Date">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="date" />

+            </menu_item_check>

+            <menu_item_separator

+             layout="topleft" />

+            <menu_item_check

+             control_name="Inventory.FoldersAlwaysByName"

+             label="Folders Always By Name"

+             layout="topleft"

+             name="Folders Always By Name">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="foldersalwaysbyname" />

+            </menu_item_check>

+            <menu_item_check

+             control_name="Inventory.SystemFoldersToTop"

+             label="System Folders To Top"

+             layout="topleft"

+             name="System Folders To Top">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="systemfolderstotop" />

+            </menu_item_check>

+        </menu>

+    </menu_bar>

+</panel>

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 3f64c9c633..190dbe2b0f 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -1,131 +1,149 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Side tray cannot show background because it is always 
-	partially on screen to hold tab buttons. -->
-<side_tray
-  name="sidebar"
-  background_visible="false"
-  mouse_opaque="true"
-  width="333"
-  collapsed="true"
->
-  <!-- Individual tabs must show background to have seemless
-	appearance up to tray panel header word like "Home".
-	Embedded panels are inset by a pixel and so their 
-	backgrounds will not block the world fully. -->
-  <sidetray_tab
-    name="sidebar_home"
-    help_topic="sidebar_home"
-    tab_title="Home"
-    description="Home."
-    image="TabIcon_Open_Off"
-	image_selected="TabIcon_Close_Off"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        name="panel_home"
-        filename="panel_sidetray_home_tab.xml"
-        label="home"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_people"
-    help_topic="sidebar_people"
-    tab_title="People"
-    description="Find your friends, contacts and people nearby."
-    image="TabIcon_People_Off"
-    image_selected="TabIcon_People_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-    <panel_container
-      name="panel_container"
-      width="333"
-    >
-      <panel
-        class="panel_people"
-        name="panel_people"
-        filename="panel_people.xml"
-      />
-      <panel
-        class="panel_profile_view"
-        name="panel_profile_view"
-        filename="panel_profile_view.xml"
-      />
-      <panel
-        class="panel_group_info_sidetray"
-        name="panel_group_info_sidetray"
-        filename="panel_group_info_sidetray.xml"
-        label="Group Info"
-        font="SansSerifBold"
-      />
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"
-      />
-
-    </panel_container>
-  </sidetray_tab>
-  
-  <sidetray_tab
-    name="sidebar_places"
-    help_topic="sidebar_places"
-    tab_title="Places"
-    label="Places"
-    description="Find places to go and places you&apos;ve visited before."
-    image="TabIcon_Places_Off"
-	image_selected="TabIcon_Places_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="panel_places"
-        name="panel_places"
-        filename="panel_places.xml"
-        label="Places"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_me"
-    help_topic="sidebar_me"
-    tab_title="Me"
-    description="Edit your public profile and Picks."
-    image="TabIcon_Me_Off"
-    image_selected="TabIcon_Me_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="panel_me_profile_view"
-        name="panel_me_profile"
-        filename="panel_me_profile.xml"
-        label="Me"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_appearance"
-    help_topic="sidebar_appearance"
-    tab_title="Appearance"
-    description="Change your appearance and current look."
-    image="TabIcon_Appearance_Off"
-    image_selected="TabIcon_Appearance_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="panel_appearance"
-        name="panel_appearance"
-        filename="panel_appearance.xml"
-        label="Edit Appearance"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
-</side_tray>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<!-- Side tray cannot show background because it is always 

+	partially on screen to hold tab buttons. -->

+<side_tray

+  name="sidebar"

+  background_visible="false"

+  mouse_opaque="true"

+  width="333"

+  collapsed="true"

+>

+  <!-- Individual tabs must show background to have seemless

+	appearance up to tray panel header word like "Home".

+	Embedded panels are inset by a pixel and so their 

+	backgrounds will not block the world fully. -->

+  <sidetray_tab

+    name="sidebar_home"

+    help_topic="sidebar_home"

+    tab_title="Home"

+    description="Home."

+    image="TabIcon_Open_Off"

+	image_selected="TabIcon_Close_Off"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+      <panel

+        name="panel_home"

+        filename="panel_sidetray_home_tab.xml"

+        label="home"

+      />

+  </sidetray_tab>

+

+  <sidetray_tab

+    name="sidebar_people"

+    help_topic="sidebar_people"

+    tab_title="People"

+    description="Find your friends, contacts and people nearby."

+    image="TabIcon_People_Off"

+    image_selected="TabIcon_People_Selected"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+    <panel_container

+      name="panel_container"

+      width="333"

+    >

+      <panel

+        class="panel_people"

+        name="panel_people"

+        filename="panel_people.xml"

+      />

+      <panel

+        class="panel_profile_view"

+        name="panel_profile_view"

+        filename="panel_profile_view.xml"

+      />

+      <panel

+        class="panel_group_info_sidetray"

+        name="panel_group_info_sidetray"

+        filename="panel_group_info_sidetray.xml"

+        label="Group Info"

+        font="SansSerifBold"

+      />

+      <panel

+        class="panel_block_list_sidetray"

+        name="panel_block_list_sidetray"

+        filename="panel_block_list_sidetray.xml"

+        label="Blocked Residents &amp; Objects"

+        font="SansSerifBold"

+      />

+

+    </panel_container>

+  </sidetray_tab>

+  

+  <sidetray_tab

+    name="sidebar_places"

+    help_topic="sidebar_places"

+    tab_title="Places"

+    label="Places"

+    description="Find places to go and places you&apos;ve visited before."

+    image="TabIcon_Places_Off"

+	image_selected="TabIcon_Places_Selected"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+      <panel

+        class="panel_places"

+        name="panel_places"

+        filename="panel_places.xml"

+        label="Places"

+        font="SansSerifBold"

+      />

+  </sidetray_tab>

+

+  <sidetray_tab

+    name="sidebar_me"

+    help_topic="sidebar_me"

+    tab_title="Me"

+    description="Edit your public profile and Picks."

+    image="TabIcon_Me_Off"

+    image_selected="TabIcon_Me_Selected"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+      <panel

+        class="panel_me_profile_view"

+        name="panel_me_profile"

+        filename="panel_me_profile.xml"

+        label="Me"

+      />

+  </sidetray_tab>

+

+  <sidetray_tab

+    name="sidebar_appearance"

+    help_topic="sidebar_appearance"

+    tab_title="Appearance"

+    description="Change your appearance and current look."

+    image="TabIcon_Appearance_Off"

+    image_selected="TabIcon_Appearance_Selected"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+      <panel

+        class="panel_appearance"

+        name="panel_appearance"

+        filename="panel_appearance.xml"

+        label="Edit Appearance"

+        font="SansSerifBold"

+      />

+  </sidetray_tab>

+

+  <sidetray_tab

+    name="sidebar_inventory"

+    help_topic="sidebar_inventory"

+    tab_title="Inventory"

+    description="Browse your inventory."

+    image="TabIcon_Inventory_Off"

+    mouse_opaque="false"

+    background_visible="true"

+  >

+      <panel

+        class="sidepanel_inventory"

+        name="sidepanel_inventory"

+        filename="sidepanel_inventory.xml"

+        label="Edit Inventory"

+        font="SansSerifBold"

+      />

+  </sidetray_tab>

+

+</side_tray>

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 247054772e..9636e32187 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -12,7 +12,7 @@
      bg_alpha_color="DkGray2"
      class="panel_sidetray_home_info"
      follows="left|top|right"
-     height="120"
+     height="90"
      layout="topleft"
      left="15"
      top="17"
@@ -42,7 +42,7 @@
          width="20" />
         <text
          follows="left|right|bottom"
-         height="120"
+         height="90"
          layout="topleft"
          left="10"
          mouse_opaque="false"
@@ -59,7 +59,7 @@
      bg_alpha_color="DkGray2"
      class="panel_sidetray_home_info"
      follows="left|top|right"
-     height="120"
+     height="90"
      layout="topleft"
      left="15"
      top_pad="15"
@@ -89,7 +89,7 @@
          image_name="TabIcon_Places_Selected"/>
         <text
          follows="all"
-         height="120"
+         height="90"
          layout="topleft"
          left="10"
          mouse_opaque="false"
@@ -106,7 +106,7 @@
      bg_alpha_color="DkGray2"
      class="panel_sidetray_home_info"
      follows="left|top|right"
-     height="120"
+     height="90"
      layout="topleft"
      left="15"
      top_pad="15"
@@ -136,7 +136,7 @@
          image_name="TabIcon_Me_Selected"/>
         <text
          follows="all"
-         height="120"
+         height="90"
          layout="topleft"
          left="10"
          mouse_opaque="false"
@@ -153,7 +153,7 @@
      bg_alpha_color="DkGray2"
      class="panel_sidetray_home_info"
      follows="left|top|right"
-     height="120"
+     height="90"
      layout="topleft"
      left="15"
      top_pad="15"
@@ -183,7 +183,7 @@
          image_name="TabIcon_Appearance_Selected"/>
         <text
          follows="all"
-         height="120"
+         height="90"
          layout="topleft"
          left="10"
          mouse_opaque="false"
@@ -195,4 +195,51 @@
             Change your appearance and current look.
         </text>
     </panel>
+    <panel
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+     class="panel_sidetray_home_info"
+     follows="left|top|right"
+     height="90"
+     layout="topleft"
+     left="15"
+     top_pad="15"
+     name="sidebar_inventory"
+     width="303">
+        <text
+         follows="left|right|top"
+         font="SansSerifBigBold"
+         height="30"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="tab_name"
+         text_color="EmphasisColor"
+         top="10"
+         value="My Inventory"
+         width="200"
+         word_wrap="true" />
+        <icon
+         follows="top|right"
+         height="20"
+         layout="topleft"
+         name="tab_icon"
+         right="-10"
+         top="10"
+         width="20"
+         image_name="TabIcon_Inventory_Selected"/>
+        <text
+         follows="all"
+         height="90"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="tab_description"
+         right="-10"
+         text_color="white"
+         top="40"
+         word_wrap="true">
+            Browse your inventory.
+        </text>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
new file mode 100644
index 0000000000..3b3fbcb936
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+ background_visible="true"

+ follows="all"

+ height="400"

+ label="Places"

+ layout="topleft"

+ min_height="350"

+ min_width="240"

+ name="objects panel"

+ width="333">

+    <tab_container

+     follows="all"

+     height="360"

+     layout="topleft"

+     left="9"

+     name="Inventory Tabs"

+     tab_position="top"

+     top="30"

+     width="313"

+	 tab_height="0"

+	 visible="true">

+	 <panel

+	      class="panel_main_inventory"

+		  filename="panel_main_inventory.xml"

+		  follows="all"

+		  layout="topleft"

+		  left="0"

+		  name="panel_main_inventory"

+		  top="15"

+		  label=""

+		  height="300"

+		  width="467">

+    <panel

+     height="25"

+     layout="bottomright"

+     left="0"

+     help_topic="objects_button_tab"

+     name="button_panel"

+	 bottom="5"

+     width="313">

+        <button

+         enabled="true"

+         follows="bottom|left"

+         font="SansSerifSmallBold"

+         height="25"

+         label="Info"

+         layout="topleft"

+         left="0"

+         name="info_btn"

+         top="0"

+         width="60" />

+        <button

+         enabled="true"

+         follows="bottom|left"

+         font="SansSerifSmallBold"

+         height="25"

+         label="Share"

+         layout="topleft"

+         left_pad="5"

+         name="share_btn"

+         top="0"

+         width="60" />

+        <button

+         enabled="false"

+         follows="bottom|left"

+         font="SansSerifSmallBold"

+         height="25"

+         label="Wear"

+         layout="topleft"

+         left="130"

+         name="wear_btn"

+         top="0"

+         width="60" />

+        <button

+         enabled="false"

+         follows="bottom|left"

+         font="SansSerifSmallBold"

+         height="25"

+         label="Play"

+         layout="topleft"

+         name="play_btn"

+         left="130"

+         top="0"

+         width="50" />

+        <button

+         enabled="false"

+         follows="bottom|left"

+         font="SansSerifSmallBold"

+         height="25"

+         label="Teleport"

+         layout="topleft"

+         left="130"

+         name="teleport_btn"

+         top="0"

+         width="77" />

+        <button

+         follows="bottom|right"

+         font="SansSerifSmallBold"

+         height="25"

+         label="v"

+         layout="topleft"

+         name="overflow_btn"

+         right="-10"

+         top="0"

+         width="30" />

+    </panel>

+    </panel>

+   </tab_container>

+

+    <panel

+     class="sidepanel_object_info"

+     filename="sidepanel_object_info.xml"

+     follows="all"

+     height="360"

+     layout="topleft"

+     left="0"

+     help_topic="objects_info_tab"

+     name="sidepanel_object_info"

+     top="30"

+     visible="false" />

+</panel>