From 28c9002e980cf2ac6a7b7c79f8e16a64994c21c4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 4 Nov 2016 15:20:01 +0200
Subject: [PATCH] MAINT-6906 Editing landmark name removes the land mark
coordinates
---
doc/contributions.txt | 1 +
indra/newview/llviewerinventory.cpp | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f875316102..c0c4f7837e6 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -204,6 +204,7 @@ Ansariel Hiller
MAINT-6744
MAINT-6752
MAINT-6773
+ MAINT-6906
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 0bbe9fa2c2a..434641aa257 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1303,12 +1303,18 @@ void update_inventory_item(
if (updates.has("asset_id"))
{
updates.erase("asset_id");
- updates["hash_id"] = update_item->getTransactionID();
+ if (update_item->getTransactionID().notNull())
+ {
+ updates["hash_id"] = update_item->getTransactionID();
+ }
}
if (updates.has("shadow_id"))
{
updates.erase("shadow_id");
- updates["hash_id"] = update_item->getTransactionID();
+ if (update_item->getTransactionID().notNull())
+ {
+ updates["hash_id"] = update_item->getTransactionID();
+ }
}
AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
AISAPI::UpdateItem(item_id, updates, cr);
--
GitLab