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/llselectmgr.cpp | |
parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) | |
parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) |
Merge branch 'master' into DRTVWR-499
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index f849fecaf6..aee6bcb05e 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5426,7 +5426,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(); } |