diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index f8bacd1ea..68fba01c8 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -56,6 +56,10 @@
 #include "lltexteditor.h"
 #include "lltextbox.h"
 
+// <edit>
+#include "lldelayeduidelete.h"
+// </edit>
+
 //HACK: this allows you to instantiate LLView from xml with "<view/>" which we don't want
 static LLRegisterWidget<LLView> r("view");
 
@@ -87,7 +91,10 @@ LLView::LLView() :
 	mUseBoundingRect(FALSE),
 	mVisible(TRUE),
 	mNextInsertionOrdinal(0),
-	mHoverCursor(UI_CURSOR_ARROW)
+	mHoverCursor(UI_CURSOR_ARROW),
+	// <edit>
+	mDelayedDelete(FALSE)
+	// </edit>
 {
 }
 
@@ -105,7 +112,10 @@ LLView::LLView(const std::string& name, BOOL mouse_opaque) :
 	mUseBoundingRect(FALSE),
 	mVisible(TRUE),
 	mNextInsertionOrdinal(0),
-	mHoverCursor(UI_CURSOR_ARROW)
+	mHoverCursor(UI_CURSOR_ARROW),
+	// <edit>
+	mDelayedDelete(FALSE)
+	// </edit>
 {
 }
 
@@ -127,7 +137,10 @@ LLView::LLView(
 	mUseBoundingRect(FALSE),
 	mVisible(TRUE),
 	mNextInsertionOrdinal(0),
-	mHoverCursor(UI_CURSOR_ARROW)
+	mHoverCursor(UI_CURSOR_ARROW),
+	// <edit>
+	mDelayedDelete(FALSE)
+	// </edit>
 {
 }
 
@@ -143,7 +156,10 @@ LLView::~LLView()
 		gFocusMgr.removeMouseCaptureWithoutCallback( this );
 	}
 
-	deleteAllChildren();
+	// <edit> TESTZONE DERF
+	//deleteAllChildren();
+	deleteAllChildren(mDelayedDelete);
+	// </edit>
 
 	if (mParentView != NULL)
 	{
@@ -575,8 +591,26 @@ BOOL LLView::focusPrev(LLView::child_list_t & result)
 // delete all children. Override this function if you need to
 // perform any extra clean up such as cached pointers to selected
 // children, etc.
-void LLView::deleteAllChildren()
+// <edit>
+//void LLView::deleteAllChildren()
+void LLView::deleteAllChildren(BOOL delay_delete)
+// </edit>
 {
+	// <edit> TESTZONE DERF
+	if(delay_delete)
+	{
+		child_list_t::iterator end = mChildList.end();
+		for(child_list_t::iterator iter = mChildList.begin(); iter != end; ++iter)
+		{
+			if((*iter)->getParent() == this)
+				(*iter)->mParentView = NULL;
+		}
+		mCtrlOrder.clear();
+		std::list<LLView*> children(mChildList);
+		gDeleteScheduler->addViewDeleteJob(children);
+		return;
+	}
+	// </edit>
 	// clear out the control ordering
 	mCtrlOrder.clear();
 
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index ddb7371c8..9c088ca47 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -331,7 +331,10 @@ public:
 	// delete all children. Override this function if you need to
 	// perform any extra clean up such as cached pointers to selected
 	// children, etc.
-	virtual void deleteAllChildren();
+	// <edit>
+	//virtual void deleteAllChildren();
+	virtual void deleteAllChildren(BOOL delay_delete = FALSE);
+	// </edit>
 
 	virtual void	setTentative(BOOL b);
 	virtual BOOL	getTentative() const;
@@ -653,6 +656,12 @@ private:
 
 	S32			mNextInsertionOrdinal;
 
+	// <edit>
+public:
+	BOOL mDelayedDelete;
+	// </edit>
+private:
+
 	static LLWindow* sWindow;	// All root views must know about their window.
 
 	typedef std::map<std::string, LLPointer<LLSimpleListener> > dispatch_list_t;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b8a49ed4b..6e0999a58 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -86,15 +86,15 @@
 #include "lluictrlfactory.h"
 #include "llselectmgr.h"
 #include "llfloateropenobject.h"
-// <edit>
-#include "llappviewer.h" // gLocalInventoryRoot
-#include "llfloateranimpreview.h" // for reuploads
-#include "llfloaterimagepreview.h" // for reuploads
-#include "llimportobject.h" // for disabling options during import
-//#include "llcheats.h"
-#include "dofloaterhex.h"
-#include "hgfloatertexteditor.h"
-// </edit>
+// <edit>
+#include "llappviewer.h" // gLocalInventoryRoot
+#include "llfloateranimpreview.h" // for reuploads
+#include "llfloaterimagepreview.h" // for reuploads
+#include "llimportobject.h" // for disabling options during import
+//#include "llcheats.h"
+#include "dofloaterhex.h"
+#include "hgfloatertexteditor.h"
+// </edit>
 
 // Helpers
 // bug in busy count inc/dec right now, logic is complex... do we really need it?
@@ -119,21 +119,21 @@ void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void*);
 void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, BOOL append);
 void remove_inventory_category_from_avatar(LLInventoryCategory* category);
 void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
-bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv*);
-void confirm_replace_attachment_rez(S32 option, void* user_data);
-// <edit>
-void gotImageForSaveItemAs(BOOL success, 
-											LLViewerImage *src_vi,
-											LLImageRaw* src, 
-											LLImageRaw* aux_src, 
-											S32 discard_level,
-											BOOL final,
-											void* userdata);
-void gotAssetForSaveItemAs(LLVFS *vfs,
-									   const LLUUID& asset_uuid,
-									   LLAssetType::EType type,
-									   void* user_data, S32 status, LLExtStat ext_status);
-// </edit>
+bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv*);
+void confirm_replace_attachment_rez(S32 option, void* user_data);
+// <edit>
+void gotImageForSaveItemAs(BOOL success, 
+											LLViewerImage *src_vi,
+											LLImageRaw* src, 
+											LLImageRaw* aux_src, 
+											S32 discard_level,
+											BOOL final,
+											void* userdata);
+void gotAssetForSaveItemAs(LLVFS *vfs,
+									   const LLUUID& asset_uuid,
+									   LLAssetType::EType type,
+									   void* user_data, S32 status, LLExtStat ext_status);
+// </edit>
 
 std::string ICON_NAME[ICON_NAME_COUNT] =
 {
@@ -212,24 +212,24 @@ time_t LLInvFVBridge::getCreationDate() const
 // Can be destoryed (or moved to trash)
 BOOL LLInvFVBridge::isItemRemovable()
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
-	// <edit>
-	//if(model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
-	//{
-	//	return TRUE;
-	//}
-	// 
-	//return FALSE;
+	// <edit>
+	//if(model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
+	//{
+	//	return TRUE;
+	//}
+	// 
+	//return FALSE;
 		return TRUE;
-	// </edit>
+	// </edit>
 }
 
 // Can be moved to another folder
@@ -246,13 +246,13 @@ void LLInvFVBridge::showProperties()
 
 void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch)
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	// Deactivate gestures when moving them into Trash
 	LLInvFVBridge* bridge;
 	LLInventoryModel* model = mInventoryPanel->getModel();
@@ -297,13 +297,13 @@ void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batc
 
 void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*>& batch)
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	// this method moves a bunch of items and folders to the trash. As
 	// per design guidelines for the inventory model, the message is
 	// built and the accounting is performed first. After all of that,
@@ -321,7 +321,18 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 	bool start_new_message = true;
 	S32 count = batch.count();
 	S32 i;
-	// <edit> close floaters first
+	// <edit> close floaters first
+	for(i = 0; i < count; ++i)
+	{
+		bridge = (LLInvFVBridge*)(batch.get(i));
+		if(!bridge || !bridge->isItemRemovable()) continue;
+		item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID());
+		if(item)
+		{
+			LLPreview::hide(item->getUUID());
+		}
+	}
+	// </edit>
 	for(i = 0; i < count; ++i)
 	{
 		bridge = (LLInvFVBridge*)(batch.get(i));
@@ -329,28 +340,17 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 		item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID());
 		if(item)
 		{
-			LLPreview::hide(item->getUUID());
-		}
-	}
-	// </edit>
-	for(i = 0; i < count; ++i)
-	{
-		bridge = (LLInvFVBridge*)(batch.get(i));
-		if(!bridge || !bridge->isItemRemovable()) continue;
-		item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID());
-		if(item)
-		{
 			if(item->getParentUUID() == trash_id) continue;
 			move_ids.push_back(item->getUUID());
-			// <edit> don't do stuff that messes with gMessageSystem
-			//LLPreview::hide(item->getUUID());
-			// </edit>
+			// <edit> don't do stuff that messes with gMessageSystem
+			//LLPreview::hide(item->getUUID());
+			// </edit>
 			--update[item->getParentUUID()];
 			++update[trash_id];
-			// <edit>
-			if(!gInventory.isObjectDescendentOf(item->getUUID(), gLocalInventoryRoot))
-			{
-			// </edit>
+			// <edit>
+			if(!gInventory.isObjectDescendentOf(item->getUUID(), gLocalInventoryRoot))
+			{
+			// </edit>
 				if(start_new_message)
 				{
 					start_new_message = false;
@@ -371,9 +371,9 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 					gInventory.accountForUpdate(update);
 					update.clear();
 				}
-			// <edit>
-			}
-			// </edit>
+			// <edit>
+			}
+			// </edit>
 		}
 	}
 	if(!start_new_message)
@@ -394,10 +394,10 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 			move_ids.push_back(cat->getUUID());
 			--update[cat->getParentUUID()];
 			++update[trash_id];
-			// <edit>
-			if(!gInventory.isObjectDescendentOf(cat->getUUID(), gLocalInventoryRoot))
-			{
-			// </edit>
+			// <edit>
+			if(!gInventory.isObjectDescendentOf(cat->getUUID(), gLocalInventoryRoot))
+			{
+			// </edit>
 				if(start_new_message)
 				{
 					start_new_message = false;
@@ -417,9 +417,9 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 					gInventory.accountForUpdate(update);
 					update.clear();
 				}
-			// <edit>
-			}
-			// </edit>
+			// <edit>
+			}
+			// </edit>
 		}
 	}
 	if(!start_new_message)
@@ -433,37 +433,37 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 	std::vector<LLUUID>::iterator end = move_ids.end();
 	for(; it != end; ++it)
 	{
-		// <edit> trash problem
-		if(gInventory.isObjectDescendentOf(*it, gLocalInventoryRoot))
-		{
-			// if it's a category, delete descendents
-			if(gInventory.getCategory(*it))
-			{
-				LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
-				cat->setDescendentCount(0);
-				LLInventoryModel::cat_array_t categories;
-				LLInventoryModel::item_array_t items;
-				gInventory.collectDescendents(cat->getUUID(),
-								   categories,
-								   items,
-								   false); // include trash?
-				S32 count = items.count();
-				S32 i;
-				for(i = 0; i < count; ++i)
-				{
-					gInventory.deleteObject(items.get(i)->getUUID());
-				}
-				count = categories.count();
-				for(i = 0; i < count; ++i)
-				{
-					gInventory.deleteObject(categories.get(i)->getUUID());
-				}
-			}
-			// delete it
-			gInventory.deleteObject(*it);
-		}
-		else
-		// </edit>
+		// <edit> trash problem
+		if(gInventory.isObjectDescendentOf(*it, gLocalInventoryRoot))
+		{
+			// if it's a category, delete descendents
+			if(gInventory.getCategory(*it))
+			{
+				LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
+				cat->setDescendentCount(0);
+				LLInventoryModel::cat_array_t categories;
+				LLInventoryModel::item_array_t items;
+				gInventory.collectDescendents(cat->getUUID(),
+								   categories,
+								   items,
+								   false); // include trash?
+				S32 count = items.count();
+				S32 i;
+				for(i = 0; i < count; ++i)
+				{
+					gInventory.deleteObject(items.get(i)->getUUID());
+				}
+				count = categories.count();
+				for(i = 0; i < count; ++i)
+				{
+					gInventory.deleteObject(categories.get(i)->getUUID());
+				}
+			}
+			// delete it
+			gInventory.deleteObject(*it);
+		}
+		else
+		// </edit>
 		gInventory.moveObject((*it), trash_id);
 	}
 
@@ -473,13 +473,13 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 
 BOOL LLInvFVBridge::isClipboardPasteable() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	BOOL is_agent_inventory = model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
@@ -550,22 +550,22 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::str
 	if (show_asset_id)
 	{
 		items.push_back(std::string("Copy Asset UUID"));
-		// <edit>
-		/*
-		// </edit>
+		// <edit>
+		/*
+		// </edit>
 		if ( (! ( isItemPermissive() || gAgent.isGodlike() ) ) 
 			  || (flags & FIRST_SELECTED_ITEM) == 0)
 		{
 			disabled_items.push_back(std::string("Copy Asset UUID"));
 		}
-		// <edit>
-		*/
-		// </edit>
+		// <edit>
+		*/
+		// </edit>
 	}
 	
-	// <edit>
-	//items.push_back(std::string("Magic Get"));
-	//items.push_back(std::string("Rez"));
+	// <edit>
+	//items.push_back(std::string("Magic Get"));
+	//items.push_back(std::string("Rez"));
 	items.push_back(std::string("Open With..."));
 
 	items.push_back(std::string("Copy Separator"));
@@ -647,13 +647,13 @@ BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
 
 LLInventoryObject* LLInvFVBridge::getInventoryObject() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return NULL;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return NULL;
+	}
+	// </edit>
 	LLInventoryObject* obj = NULL;
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(model)
@@ -665,13 +665,13 @@ LLInventoryObject* LLInvFVBridge::getInventoryObject() const
 
 BOOL LLInvFVBridge::isInTrash() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -680,13 +680,13 @@ BOOL LLInvFVBridge::isInTrash() const
 
 BOOL LLInvFVBridge::isAgentInventory() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	if(gAgent.getInventoryRootID() == mUUID) return TRUE;
@@ -704,9 +704,9 @@ void LLInvFVBridge::changeItemParent(LLInventoryModel* model,
 									 const LLUUID& new_parent,
 									 BOOL restamp)
 {
-	// <edit>
-	bool send_parent_update = gInventory.isObjectDescendentOf(item->getUUID(), gAgent.getInventoryRootID());
-	// </edit>
+	// <edit>
+	bool send_parent_update = gInventory.isObjectDescendentOf(item->getUUID(), gAgent.getInventoryRootID());
+	// </edit>
 	if(item->getParentUUID() != new_parent)
 	{
 		LLInventoryModel::update_list_t update;
@@ -718,9 +718,9 @@ void LLInvFVBridge::changeItemParent(LLInventoryModel* model,
 
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 		new_item->setParent(new_parent);
-		// <edit>
-		if(send_parent_update)
-		// </edit>
+		// <edit>
+		if(send_parent_update)
+		// </edit>
 		new_item->updateParentOnServer(restamp);
 		model->updateItem(new_item);
 		model->notifyObservers();
@@ -969,22 +969,22 @@ void LLItemBridge::selectItem()
 	LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem();
 	if(item && !item->isComplete())
 	{
-		// <edit>
-		if(!(gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot)))
-		// </edit>
+		// <edit>
+		if(!(gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot)))
+		// </edit>
 		item->fetchFromServer();
 	}
 }
 
 void LLItemBridge::restoreItem()
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem();
 	if(item)
 	{
@@ -1088,11 +1088,11 @@ std::string LLItemBridge::getLabelSuffix() const
 	if(item) 
 	{
 		// it's a bit confusing to put nocopy/nomod/etc on calling cards.
-		// <edit> Not really sheesh
-		//if(LLAssetType::AT_CALLINGCARD != item->getType()
-		//   && item->getPermissions().getOwner() == gAgent.getID())
-		if(item->getPermissions().getOwner() == gAgent.getID())
-		// </edit>
+		// <edit> Not really sheesh
+		//if(LLAssetType::AT_CALLINGCARD != item->getType()
+		//   && item->getPermissions().getOwner() == gAgent.getID())
+		if(item->getPermissions().getOwner() == gAgent.getID())
+		// </edit>
 		{
 			BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
 			BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
@@ -1143,13 +1143,13 @@ BOOL LLItemBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable()) return FALSE;
 	LLPreview::rename(mUUID, getPrefix() + new_name);
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLViewerInventoryItem* item = getItem();
@@ -1176,13 +1176,13 @@ BOOL LLItemBridge::removeItem()
 	}
 	// move it to the trash
 	LLPreview::hide(mUUID, TRUE);
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -1191,16 +1191,16 @@ BOOL LLItemBridge::removeItem()
 	// if item is not already in trash
 	if(item && !model->isObjectDescendentOf(mUUID, trash_id))
 	{
-		// <edit> trash problem
-		if(gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot))
-		{
-			LLInventoryModel::LLCategoryUpdate up(item->getParentUUID(), -1);
-			gInventory.deleteObject(mUUID);
-			gInventory.accountForUpdate(up);
-			gInventory.notifyObservers();
-		}
-		else
-		// </edit>
+		// <edit> trash problem
+		if(gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot))
+		{
+			LLInventoryModel::LLCategoryUpdate up(item->getParentUUID(), -1);
+			gInventory.deleteObject(mUUID);
+			gInventory.accountForUpdate(up);
+			gInventory.notifyObservers();
+		}
+		else
+		// </edit>
 		// move to trash, and restamp
 		LLInvFVBridge::changeItemParent(model, item, trash_id, TRUE);
 		// delete was successful
@@ -1234,13 +1234,13 @@ BOOL LLItemBridge::copyToClipboard() const
 
 LLViewerInventoryItem* LLItemBridge::getItem() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return NULL;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return NULL;
+	}
+	// </edit>
 	LLViewerInventoryItem* item = NULL;
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(model)
@@ -1289,27 +1289,27 @@ void LLFolderBridge::selectItem()
 // Can be destroyed (or moved to trash)
 BOOL LLFolderBridge::isItemRemovable()
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) 
 	{
 		return FALSE;
 	}
 
-	// <edit>
-	// People delete their inventory easily...
-	if(mUUID == gAgent.getInventoryRootID())
-	{
-		return FALSE;
-	}
-	/*
-	// </edit>
+	// <edit>
+	// People delete their inventory easily...
+	if(mUUID == gAgent.getInventoryRootID())
+	{
+		return FALSE;
+	}
+	/*
+	// </edit>
 	if(!model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
 	{
 		return FALSE;
@@ -1366,22 +1366,22 @@ BOOL LLFolderBridge::isItemRemovable()
 			}
 		}
 	}
-	// <edit>
-	*/
-	// </edit>
+	// <edit>
+	*/
+	// </edit>
 
 	return TRUE;
 }
 
 BOOL LLFolderBridge::isUpToDate() const
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLViewerInventoryCategory* category = (LLViewerInventoryCategory*)model->getCategory(mUUID);
@@ -1390,10 +1390,10 @@ BOOL LLFolderBridge::isUpToDate() const
 		return FALSE;
 	}
 
-	// <edit> trying to make it stop trying to fetch Local Inventory
-	//return category->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN;
-	return (category->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN) || (mUUID == gLocalInventoryRoot) || (gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot));
-	// </edit>
+	// <edit> trying to make it stop trying to fetch Local Inventory
+	//return category->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN;
+	return (category->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN) || (mUUID == gLocalInventoryRoot) || (gInventory.isObjectDescendentOf(mUUID, gLocalInventoryRoot));
+	// </edit>
 }
 
 BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
@@ -1403,13 +1403,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 	// the UI will get confused and pass in a NULL.
 	if(!inv_cat) return FALSE;
 
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 
@@ -1859,13 +1859,13 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model
 	}
 	else if ("removefromoutfit" == action)
 	{
-		// <edit> derf
-		if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-		{
-			llwarns << "scheduled for delayed delete" << llendl;
-			return;
-		}
-		// </edit>
+		// <edit> derf
+		if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+		{
+			llwarns << "scheduled for delayed delete" << llendl;
+			return;
+		}
+		// </edit>
 		LLInventoryModel* model = mInventoryPanel->getModel();
 		if(!model) return;
 		LLViewerInventoryCategory* cat = getCategory();
@@ -1897,13 +1897,13 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model
 void LLFolderBridge::openItem()
 {
 	lldebugs << "LLFolderBridge::openItem()" << llendl;
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	model->fetchDescendentsOf(mUUID);
@@ -1922,6 +1922,13 @@ BOOL LLFolderBridge::isItemRenameable() const
 
 void LLFolderBridge::restoreItem()
 {
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLViewerInventoryCategory* cat;
 	cat = (LLViewerInventoryCategory*)getCategory();
 	if(cat)
@@ -2000,13 +2007,13 @@ LLUIImagePtr LLFolderBridge::getIcon() const
 
 BOOL LLFolderBridge::renameItem(const std::string& new_name)
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	if(!isItemRenameable()) return FALSE;
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
@@ -2026,21 +2033,21 @@ BOOL LLFolderBridge::renameItem(const std::string& new_name)
 
 BOOL LLFolderBridge::removeItem()
 {
-	// <edit>
-	//if(!isItemRemovable())
-	//{
-	//	return FALSE;
-	//}
-	// </edit>
+	// <edit>
+	//if(!isItemRemovable())
+	//{
+	//	return FALSE;
+	//}
+	// </edit>
 	// move it to the trash
 	LLPreview::hide(mUUID);
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 
@@ -2068,41 +2075,41 @@ BOOL LLFolderBridge::removeItem()
 	LLViewerInventoryCategory* cat = getCategory();
 	if(cat)
 	{
-		// <edit> trash problem
-		if(gInventory.isObjectDescendentOf(cat->getUUID(), gLocalInventoryRoot))
-		{
-			S32 descendents = cat->getDescendentCount();
-			if(descendents > 0)
-			{
-				LLInventoryModel::LLCategoryUpdate up(cat->getUUID(), -descendents);
-				gInventory.accountForUpdate(up);
-			}
-			cat->setDescendentCount(0);
-			LLInventoryModel::cat_array_t categories;
-			LLInventoryModel::item_array_t items;
-			gInventory.collectDescendents(cat->getUUID(),
-							   categories,
-							   items,
-							   false); // include trash?
-			S32 count = items.count();
-			S32 i;
-			for(i = 0; i < count; ++i)
-			{
-				gInventory.deleteObject(items.get(i)->getUUID());
-			}
-			count = categories.count();
-			for(i = 0; i < count; ++i)
-			{
-				gInventory.deleteObject(categories.get(i)->getUUID());
-			}
-
-			LLInventoryModel::LLCategoryUpdate up(cat->getParentUUID(), -descendents);
-			gInventory.deleteObject(cat->getUUID());
-			gInventory.accountForUpdate(up);
-			gInventory.notifyObservers();
-		}
-		else
-		// </edit>
+		// <edit> trash problem
+		if(gInventory.isObjectDescendentOf(cat->getUUID(), gLocalInventoryRoot))
+		{
+			S32 descendents = cat->getDescendentCount();
+			if(descendents > 0)
+			{
+				LLInventoryModel::LLCategoryUpdate up(cat->getUUID(), -descendents);
+				gInventory.accountForUpdate(up);
+			}
+			cat->setDescendentCount(0);
+			LLInventoryModel::cat_array_t categories;
+			LLInventoryModel::item_array_t items;
+			gInventory.collectDescendents(cat->getUUID(),
+							   categories,
+							   items,
+							   false); // include trash?
+			S32 count = items.count();
+			S32 i;
+			for(i = 0; i < count; ++i)
+			{
+				gInventory.deleteObject(items.get(i)->getUUID());
+			}
+			count = categories.count();
+			for(i = 0; i < count; ++i)
+			{
+				gInventory.deleteObject(categories.get(i)->getUUID());
+			}
+
+			LLInventoryModel::LLCategoryUpdate up(cat->getParentUUID(), -descendents);
+			gInventory.deleteObject(cat->getUUID());
+			gInventory.accountForUpdate(up);
+			gInventory.notifyObservers();
+		}
+		else
+		// </edit>
 		LLInvFVBridge::changeCategoryParent(model, cat, trash_id, TRUE);
 	}
 
@@ -2120,13 +2127,13 @@ BOOL LLFolderBridge::isClipboardPasteable() const
 
 void LLFolderBridge::pasteFromClipboard()
 {
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(model && isClipboardPasteable())
 	{
@@ -2164,13 +2171,13 @@ void LLFolderBridge::folderOptionsMenu()
 
 	// *TODO: Translate
 	
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 
@@ -2208,8 +2215,15 @@ void LLFolderBridge::folderOptionsMenu()
 		// Only enable add/replace outfit for non-default folders.
 		if (!is_default_folder)
 		{
-			mItems.push_back(std::string("Add To Outfit"));
-			mItems.push_back(std::string("Replace Outfit"));
+			// <edit> don't allow attaching stuff during attachment import
+			if(!(LLXmlImport::sImportInProgress && LLXmlImport::sImportHasAttachments))
+			{
+			// </edit>
+				mItems.push_back(std::string("Add To Outfit"));
+				mItems.push_back(std::string("Replace Outfit"));
+			// <edit>
+			}
+			// </edit>
 		}
 		mItems.push_back(std::string("Take Off Items"));
 	}
@@ -2234,14 +2248,13 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	// *TODO: Translate
 	lldebugs << "LLFolderBridge::buildContextMenu()" << llendl;
 //	std::vector<std::string> disabled_items;
-//	std::vector<std::string> disabled_items;
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -2349,18 +2362,25 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	}
 	else
 	{
-		// <edit>
-		//mItems.push_back(std::string("--no options--"));
-		//mDisabledItems.push_back(std::string("--no options--"));
-		mItems.push_back(std::string("Save As..."));
-		mItems.push_back(std::string("Save InvCache..."));
-		// </edit>
+		// <edit>
+		//mItems.push_back(std::string("--no options--"));
+		//mDisabledItems.push_back(std::string("--no options--"));
+		mItems.push_back(std::string("Save As..."));
+		mItems.push_back(std::string("Save InvCache..."));
+		// </edit>
 	}
 	hideContextEntries(menu, mItems, mDisabledItems);
 }
 
 BOOL LLFolderBridge::hasChildren() const
 {
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLInventoryModel::EHasChildren has_children;
@@ -2401,14 +2421,14 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
 }
 
 LLViewerInventoryCategory* LLFolderBridge::getCategory() const
-{
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return NULL;
-	}
-	// </edit>
+{
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return NULL;
+	}
+	// </edit>
 	LLViewerInventoryCategory* cat = NULL;
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(model)
@@ -2430,6 +2450,13 @@ void LLFolderBridge::createNewCategory(void* user_data)
 {
 	LLFolderBridge* bridge = (LLFolderBridge*)user_data;
 	if(!bridge) return;
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), bridge->mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// <edit>
 	LLInventoryPanel* panel = bridge->mInventoryPanel;
 	LLInventoryModel* model = panel->getModel();
 	if(!model) return;
@@ -2533,14 +2560,14 @@ void LLFolderBridge::createWearable(LLUUID parent_id, EWearableType type)
 }
 
 void LLFolderBridge::modifyOutfit(BOOL append)
-{
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+{
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	LLViewerInventoryCategory* cat = getCategory();
@@ -2591,14 +2618,14 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 
 BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 										BOOL drop)
-{
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+{
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 
@@ -3087,14 +3114,14 @@ LLCallingCardBridge::~LLCallingCardBridge()
 }
 
 void LLCallingCardBridge::refreshFolderViewItem()
-{
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return;
-	}
-	// </edit>
+{
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return;
+	}
+	// </edit>
 	LLFolderViewItem* itemp = mInventoryPanel->getRootFolder()->getItemByID(mUUID);
 	if (itemp)
 	{
@@ -3601,12 +3628,12 @@ std::string LLObjectBridge::sPrefix("Object: ");
 LLUUID LLObjectBridge::sContextMenuItemID;
 
 BOOL LLObjectBridge::isItemRemovable()
-{
-	// <edit>
-	//LLVOAvatar* avatar = gAgent.getAvatarObject();
-	//if(!avatar) return FALSE;
-	//if(avatar->isWearingAttachment(mUUID)) return FALSE;
-	// </edit>
+{
+	// <edit>
+	//LLVOAvatar* avatar = gAgent.getAvatarObject();
+	//if(!avatar) return FALSE;
+	//if(avatar->isWearingAttachment(mUUID)) return FALSE;
+	// </edit>
 	return LLInvFVBridge::isItemRemovable();
 }
 
@@ -3715,18 +3742,18 @@ std::string LLObjectBridge::getLabelSuffix() const
 		LLStringUtil::toLower(attachment_point_name);
 		return LLItemBridge::getLabelSuffix() + std::string(" (worn on ") + attachment_point_name + std::string(")");
 	}
-	else
-	{
-		// <edit> testzone attachpt
-		if(avatar)
-		{
-			std::map<S32, LLUUID>::iterator iter = avatar->mUnsupportedAttachmentPoints.begin();
-			std::map<S32, LLUUID>::iterator end = avatar->mUnsupportedAttachmentPoints.end();
-			for( ; iter != end; ++iter)
-				if((*iter).second == mUUID)
-					return LLItemBridge::getLabelSuffix() + llformat(" (worn on unsupported point %d)", (*iter).first);
-		}
-		// </edit>
+	else
+	{
+		// <edit> testzone attachpt
+		if(avatar)
+		{
+			std::map<S32, LLUUID>::iterator iter = avatar->mUnsupportedAttachmentPoints.begin();
+			std::map<S32, LLUUID>::iterator end = avatar->mUnsupportedAttachmentPoints.end();
+			for( ; iter != end; ++iter)
+				if((*iter).second == mUUID)
+					return LLItemBridge::getLabelSuffix() + llformat(" (worn on unsupported point %d)", (*iter).first);
+		}
+		// </edit>
 		return LLItemBridge::getLabelSuffix();
 	}
 }
@@ -3825,19 +3852,19 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			if( avatarp->isWearingAttachment( mUUID ) )
 			{
 				items.push_back(std::string("Detach From Yourself"));
-			}
-			else
-			// <edit> testzone attachpt
-			if( avatarp->isWearingUnsupportedAttachment( mUUID ) )
-			{
-				items.push_back(std::string("Detach From Yourself"));
-			}
-			else
-			// </edit>
-			// <edit> don't allow attaching objects while importing attachments
-			//if( !isInTrash() )
-			if( !isInTrash() && !(LLXmlImport::sImportInProgress && LLXmlImport::sImportHasAttachments))
-			// </edit>
+			}
+			else
+			// <edit> testzone attachpt
+			if( avatarp->isWearingUnsupportedAttachment( mUUID ) )
+			{
+				items.push_back(std::string("Detach From Yourself"));
+			}
+			else
+			// </edit>
+			// <edit> don't allow attaching objects while importing attachments
+			//if( !isInTrash() )
+			if( !isInTrash() && !(LLXmlImport::sImportInProgress && LLXmlImport::sImportHasAttachments))
+			// </edit>
 			{
 				items.push_back(std::string("Attach Separator"));
 				items.push_back(std::string("Object Wear"));
@@ -3872,40 +3899,38 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 								NULL, &attach_label, (void*)attachment));
 						}
 
-						}
-
-						// <edit> derf
-						if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-						{
-							llwarns << "scheduled for delayed delete" << llendl;
-						}
-						else
-						{
-						// </edit>
-						LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachObject");
-
-						if (callback)
+						// <edit> derf
+						if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
 						{
-							new_item->addListener(callback, "on_click", LLSD(attachment->getName()));
+							llwarns << "scheduled for delayed delete" << llendl;
 						}
-						// <edit> derf
+						else
+						{
+							// </edit>
+							LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachObject");
+
+							if (callback)
+							{
+								new_item->addListener(callback, "on_click", LLSD(attachment->getName()));
+							}
+							// <edit> derf
+						}
+							// </edit>
 					}
-						// </edit>
-					}
-					// <edit>
-					LLMenuItemCallGL *new_item = new LLMenuItemCallGL("Custom...", NULL, NULL);
-					attach_menu->append(new_item);
-					if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-					{
-						llwarns << "scheduled for delayed delete" << llendl;
-					}
-					else
-					{
-						LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachCustom");
-						new_item->addListener(callback, "on_click", NULL);
+					// <edit>
+					LLMenuItemCallGL *new_item = new LLMenuItemCallGL("Custom...", NULL, NULL);
+					attach_menu->append(new_item);
+					if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+					{
+						llwarns << "scheduled for delayed delete" << llendl;
+					}
+					else
+					{
+						LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachCustom");
+						new_item->addListener(callback, "on_click", NULL);
+				}
+					// </edit>
 				}
-					// </edit>
-				}
 			}
 		}
 	}
@@ -3916,13 +3941,13 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable()) return FALSE;
 	LLPreview::rename(mUUID, getPrefix() + new_name);
-	// <edit> derf
-	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
-	{
-		llwarns << "scheduled for delayed delete" << llendl;
-		return FALSE;
-	}
-	// </edit>
+	// <edit> derf
+	if(std::find(LLInventoryPanel::sInstances.begin(), LLInventoryPanel::sInstances.end(), mInventoryPanel) == LLInventoryPanel::sInstances.end())
+	{
+		llwarns << "scheduled for delayed delete" << llendl;
+		return FALSE;
+	}
+	// </edit>
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return FALSE;
 	LLViewerInventoryItem* item = getItem();
@@ -4723,8 +4748,8 @@ BOOL LLWearableBridge::renameItem(const std::string& new_name)
 
 BOOL LLWearableBridge::isItemRemovable()
 {
-	// <edit>
-	//if(gAgent.isWearingItem(mUUID)) return FALSE;
+	// <edit>
+	//if(gAgent.isWearingItem(mUUID)) return FALSE;
 	// </edit>
 	return LLInvFVBridge::isItemRemovable();
 }
@@ -4895,6 +4920,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 											 (void*)this));*/
 		}
 	}
+
 	hideContextEntries(menu, items, disabled_items);
 }
 
diff --git a/indra/newview/llinventoryview.cpp b/indra/newview/llinventoryview.cpp
index 82691653d..4b2233683 100644
--- a/indra/newview/llinventoryview.cpp
+++ b/indra/newview/llinventoryview.cpp
@@ -1622,6 +1622,9 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 
 		if (itemp)
 		{
+			// <edit>
+			itemp->mDelayedDelete = TRUE;
+			// </edit>
 			if (parent_folder)
 			{
 				itemp->addToFolder(parent_folder, mFolders);
diff --git a/indra/newview/llinventoryview.h b/indra/newview/llinventoryview.h
index a6f39dbb1..ea015d52d 100644
--- a/indra/newview/llinventoryview.h
+++ b/indra/newview/llinventoryview.h
@@ -79,9 +79,10 @@ public:
 			BOOL allow_multi_select,
 			LLView *parent_view = NULL);
 	~LLInventoryPanel();
-	// <edit>
-	static std::list<LLInventoryPanel*> sInstances;
-	// </edit>
+
+	// <edit>
+	static std::list<LLInventoryPanel*> sInstances;
+	// </edit>
 
 	LLInventoryModel* getModel() { return mInventory; }
 
@@ -141,9 +142,9 @@ protected:
 	// Given the id and the parent, build all of the folder views.
 	void rebuildViewsFor(const LLUUID& id, U32 mask);
 	void buildNewViews(const LLUUID& id);
-	// <edit>
-	void buildNewViews(const LLInventoryObject* objectp);
-	// </edit>
+	// <edit>
+	void buildNewViews(const LLInventoryObject* objectp);
+	// </edit>
 
 public:
 	// TomY TODO: Move this elsewhere?