diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-04-09 16:21:56 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-04-09 16:21:56 +0300 |
| commit | 75b93c15abc9ad9964fd5ef1e89335e50bdd6647 (patch) | |
| tree | 76479705f3ee647d77e8fc584110dc0b2c25887f /indra | |
| parent | 8683c47615fefb6fe531ceca4bf428a0faf010c2 (diff) | |
MAINT-2245 FIXED Object's content doesn't display inside "Buy" dialog when prim is set for sale
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c789719291..1900112822 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2563,8 +2563,8 @@ void LLViewerObject::dirtyInventory() mInventory->clear(); // will deref and delete entries delete mInventory; mInventory = NULL; - mInventoryDirty = TRUE; } + mInventoryDirty = TRUE; } void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener, void* user_data) @@ -2601,12 +2601,15 @@ void LLViewerObject::clearInventoryListeners() void LLViewerObject::requestInventory() { - 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) { - //mInventory->clear() // will deref and delete it - //delete mInventory; - //mInventory = NULL; doInventoryCallback(); } // throw away duplicate requests |