diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
commit | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch) | |
tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/newview/llviewerobject.cpp | |
parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) |
DRTVWR-440, merge in latest from 6.3.7 release
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 17e61d3a0d..efd8a23a5f 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2982,6 +2982,7 @@ void LLViewerObject::fetchInventoryFromServer() if (!isInventoryPending()) { delete mInventory; + mInventory = NULL; // Results in processTaskInv LLMessageSystem* msg = gMessageSystem; |