diff options
| author | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
| commit | 86009f885efc796850d3e5b612c896a9d737fb86 (patch) | |
| tree | 404923800dbc6d09ea72b10de0c7f4bb103d1e62 /indra/newview/llselectmgr.cpp | |
| parent | 17598f936bb6b099f21fc32aa80b68258cdfd0b9 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
SL-10297: merge up to master at 6.4.3
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index f849fecaf6..56068b3bbb 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -35,7 +35,6 @@ #include "llcachename.h" #include "llavatarnamecache.h" #include "lldbstrings.h" -#include "lleconomy.h" #include "llgl.h" #include "llmediaentry.h" #include "llrender.h" @@ -5426,7 +5425,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data } else { - if (node->mInventorySerial != inv_serial) + if (node->mInventorySerial != inv_serial && node->getObject()) { node->getObject()->dirtyInventory(); } |