diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index c7ce397067..ed9ffbf093 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2554,7 +2554,10 @@ void LLViewerObject::doUpdateInventory(
 	LLViewerInventoryItem* old_item = NULL;
 	if(TASK_INVENTORY_ITEM_KEY == key)
 	{
-		old_item = (LLViewerInventoryItem*)getInventoryObject(item->getUUID());
+		// <FS:ND> Do not use C-Style cast for polymorphic upcasting
+//		old_item = (LLViewerInventoryItem*)getInventoryObject(item->getUUID());
+		old_item = dynamic_cast<LLViewerInventoryItem*>(getInventoryObject(item->getUUID()));
+		// </FS:ND>
 	}
 	else if(TASK_INVENTORY_ASSET_KEY == key)
 	{