From 2b18e2158fc21ced6b4afa71f5325af58a01dd2f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 4 Nov 2016 12:43:16 +0100
Subject: [PATCH] FIRE-20311: Editing landmarks breaks the landmark

---
 indra/newview/llviewerinventory.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 620d69e820..b9149875aa 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1441,12 +1441,24 @@ void update_inventory_item(
     if (updates.has("asset_id"))
     {
         updates.erase("asset_id");
-        updates["hash_id"] = update_item->getTransactionID();
+        // <FS:Ansariel> Check for non-null UUID as in LLViewerInventoryItem::updateServer
+        //updates["hash_id"] = update_item->getTransactionID();
+        if(update_item->getTransactionID().notNull())
+        {
+            updates["hash_id"] = update_item->getTransactionID();
+        }
+        // </FS:Ansariel>
     }
     if (updates.has("shadow_id"))
     {
         updates.erase("shadow_id");
-        updates["hash_id"] = update_item->getTransactionID();
+        // <FS:Ansariel> Check for non-null UUID as in LLViewerInventoryItem::updateServer
+        //updates["hash_id"] = update_item->getTransactionID();
+        if(update_item->getTransactionID().notNull())
+        {
+            updates["hash_id"] = update_item->getTransactionID();
+        }
+        // </FS:Ansariel>
     }
     AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
     AISAPI::UpdateItem(item_id, updates, cr);