diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-01-28 21:42:31 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-01-28 21:42:31 +0200 |
| commit | b304adc02e518a0ba8c5feae642b656c53cbc44a (patch) | |
| tree | 9a3a84bce34fcaaaf74182bdb64c238e1f193e4e /indra/newview/llviewerobject.cpp | |
| parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) | |
| parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) | |
Merge branch 'master' into DRTVWR-499
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 05230c17e0..fe3e4cdd61 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2987,6 +2987,7 @@ void LLViewerObject::fetchInventoryFromServer() if (!isInventoryPending()) { delete mInventory; + mInventory = NULL; // Results in processTaskInv LLMessageSystem* msg = gMessageSystem; |