livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset 4a3ccad12519 (workaround fix for FIRE-15508) - LL fix is coming up

Ansariel 2015-04-17 01:02:18 +02:00
parent cfba0b8b8b
commit ec3afa718b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llviewerobject.cpp
View File

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