From 8fdc810a2329063d136458dff5a4c7d307db3feb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 3 Feb 2011 04:07:36 -0800
Subject: Addresses mantis #5360: CreatorData was being written as long as it
 wasn't null. This made iars backwards incompatible when some items had
 non-null foreign creators. This patch adds an explicit option (-c) to
 preserve foreign creator information.

---
 OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Serialization')

diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index d5e84c7..f138437 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Framework.Serialization.External
             writer.WriteStartElement("GroupOwned");
             writer.WriteString(inventoryItem.GroupOwned.ToString());
             writer.WriteEndElement();
-            if (inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
+            if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
                 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
             else if (options.ContainsKey("profile"))
             {
-- 
cgit v1.1