diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:17:51 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:17:51 +0200 |
commit | e58b5263598368b6dec4a836c72c69b50d701911 (patch) | |
tree | d454f4ed2089cef10d6033f3780476b146e3dd7e /indra/newview/llviewerobject.cpp | |
parent | 95af08341c5b20e7faeb58a4d39fae5d8b25fcee (diff) | |
parent | a52ef7ad60c8821fcb412988d838b58c0414ac8f (diff) |
Merge branch 'DRTVWR-500' into DRTVWR-501
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; |