diff options
| author | Melanie | 2011-02-05 04:25:14 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-05 04:25:14 +0000 |
| commit | f78831ec9841eccea9ecb4077193e2ae7c3985c3 (patch) | |
| tree | b6118825d9dd4ebfc1f1f1f966009ac30b293af5 /OpenSim/Framework/Serialization | |
| parent | Fix a typo in the QUERYACCESS method name (diff) | |
| parent | Added an additional debug message, and removed a bunch of files that weren't ... (diff) | |
| download | opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.zip opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.gz opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.bz2 opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | 2 |
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 | { |