diff options
| author | Diva Canto | 2011-02-03 04:07:36 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-02-03 04:07:36 -0800 |
| commit | 8fdc810a2329063d136458dff5a4c7d307db3feb (patch) | |
| tree | df1d6334ba880e83e97aca3f6adbc7c175abff9a /OpenSim/Framework/Serialization | |
| parent | Comment out texture CAPS 'texture not found' message for now (diff) | |
| download | opensim-SC-8fdc810a2329063d136458dff5a4c7d307db3feb.zip opensim-SC-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.gz opensim-SC-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.bz2 opensim-SC-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.xz | |
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.
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 | { |