From 6863eb66518ff9d306915e530a2aa684417b4432 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 11 Sep 2014 16:02:54 -0400 Subject: [PATCH] Be sure the object's inventory serial is incorrect before dirtying the inventory Thanks to Ubit for pointing this out --- indra/newview/llselectmgr.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c10570d7d..55f723651 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5201,7 +5201,9 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data { if (node->mInventorySerial != inv_serial) { - node->getObject()->dirtyInventory(); + if (LLViewerObject* object = node->getObject()) + if (object->getInventorySerial() != inv_serial) // Singu Note: the serial number in the object may be correct. + object->dirtyInventory(); } // save texture data as soon as we get texture perms first time