summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-06 21:31:34 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-06 21:31:34 +0200
commitfa39ff67f081e2e957d2ba7fd9f014747ff10963 (patch)
treedc67779842f2a670e5c242c07e24d27ec701f8d5 /indra/newview/llselectmgr.cpp
parent2076f4af0fc946c3bd79754a1deefc495ee7edb9 (diff)
parent9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff)
Merge branch 'master' into DRTVWR-497
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp2
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();
}