From ec3afa718b4b35f6d045bd0ba25917c84e737eb2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 17 Apr 2015 01:02:18 +0200
Subject: [PATCH] Backed out changeset 4a3ccad12519 (workaround fix for
 FIRE-15508) - LL fix is coming up

---
 indra/newview/llviewerobject.cpp | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index c1656e8601..a65ad7cf50 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2871,12 +2871,8 @@ void LLViewerObject::dirtyInventory()
 		mInventory->clear(); // will deref and delete entries
 		delete mInventory;
 		mInventory = NULL;
-	// <FS:Ansariel> FIRE-15508: Partially backing out MAINT-2245 for now because of object corruption until MAINT-4897 is fixed
-	//}
-	//mInventoryDirty = TRUE;
-		mInventoryDirty = TRUE;
 	}
-	// </FS:Ansariel>
+	mInventoryDirty = TRUE;
 }
 
 void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener, void* user_data)
@@ -2913,16 +2909,13 @@ void LLViewerObject::clearInventoryListeners()
 
 void LLViewerObject::requestInventory()
 {
-	// <FS:Ansariel> FIRE-15508: Partially backing out MAINT-2245 for now because of object corruption until MAINT-4897 is fixed
-	//if(mInventoryDirty && mInventory && !mInventoryCallbacks.empty())
-	//{
-	//	mInventory->clear(); // will deref and delete entries
-	//	delete mInventory;
-	//	mInventory = NULL;
-	//	mInventoryDirty = FALSE; //since we are going to request it now
-	//}
-	mInventoryDirty = FALSE;
-	// </FS:Ansariel>
+	if(mInventoryDirty && mInventory && !mInventoryCallbacks.empty())
+	{
+		mInventory->clear(); // will deref and delete entries
+		delete mInventory;
+		mInventory = NULL;
+		mInventoryDirty = FALSE; //since we are going to request it now
+	}
 	if(mInventory)
 	{
 		doInventoryCallback();