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;
- // FIRE-15508: Partially backing out MAINT-2245 for now because of object corruption until MAINT-4897 is fixed
- //}
- //mInventoryDirty = TRUE;
- mInventoryDirty = TRUE;
}
- //
+ mInventoryDirty = TRUE;
}
void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener, void* user_data)
@@ -2913,16 +2909,13 @@ void LLViewerObject::clearInventoryListeners()
void LLViewerObject::requestInventory()
{
- // 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;
- //
+ 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();