svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

1 files changed, 18 insertions, 2 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1aa7d2c3ff..8745a73e79 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2145,7 +2145,7 @@ void LLViewerObject::deleteInventoryItem(const LLUUID& item_id)
 }
 
 void LLViewerObject::doUpdateInventory(
-	LLViewerInventoryItem* item,
+	LLPointer<LLViewerInventoryItem>& item,
 	U8 key,
 	bool is_new)
 {
@@ -2217,7 +2217,8 @@ void LLViewerObject::doUpdateInventory(
 				--mInventorySerialNum;
 			}
 		}
-		LLViewerInventoryItem* new_item = new LLViewerInventoryItem(item);
+		LLViewerInventoryItem* oldItem = item;
+		LLViewerInventoryItem* new_item = new LLViewerInventoryItem(oldItem);
 		new_item->setPermissions(perm);
 		mInventory->push_front(new_item);
 		doInventoryCallback();
@@ -2608,6 +2609,21 @@ void LLViewerObject::updateInventory(
 	doUpdateInventory(task_item, key, is_new);
 }
 
+void LLViewerObject::updateInventoryLocal(LLInventoryItem* item, U8 key)
+{
+	LLPointer<LLViewerInventoryItem> task_item =
+		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+								  item->getAssetUUID(), item->getType(),
+								  item->getInventoryType(),
+								  item->getName(), item->getDescription(),
+								  item->getSaleInfo(), item->getFlags(),
+								  item->getCreationDate());
+
+	// do the internal logic
+	const bool is_new = false;
+	doUpdateInventory(task_item, key, is_new);
+}
+
 LLInventoryObject* LLViewerObject::getInventoryObject(const LLUUID& item_id)
 {
 	LLInventoryObject* rv = NULL;