aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
diff options
context:
space:
mode:
authorBlueWall2011-02-12 20:42:11 -0500
committerBlueWall2011-02-12 20:42:11 -0500
commitc0e1742d479d4390701688da685892555f28bfbc (patch)
tree39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
parentMerge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parentFixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff)
downloadopensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs')
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs2
1 files changed, 1 insertions, 1 deletions
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
303 writer.WriteStartElement("GroupOwned"); 303 writer.WriteStartElement("GroupOwned");
304 writer.WriteString(inventoryItem.GroupOwned.ToString()); 304 writer.WriteString(inventoryItem.GroupOwned.ToString());
305 writer.WriteEndElement(); 305 writer.WriteEndElement();
306 if (inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty) 306 if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
307 writer.WriteElementString("CreatorData", inventoryItem.CreatorData); 307 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
308 else if (options.ContainsKey("profile")) 308 else if (options.ContainsKey("profile"))
309 { 309 {