diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs')
| -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 88f9581..f2a6b8b 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
| @@ -277,7 +277,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 277 | writer.WriteStartElement("GroupOwned"); | 277 | writer.WriteStartElement("GroupOwned"); |
| 278 | writer.WriteString(inventoryItem.GroupOwned.ToString()); | 278 | writer.WriteString(inventoryItem.GroupOwned.ToString()); |
| 279 | writer.WriteEndElement(); | 279 | writer.WriteEndElement(); |
| 280 | if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty) | 280 | if (options.ContainsKey("creators") && !string.IsNullOrEmpty(inventoryItem.CreatorData)) |
| 281 | writer.WriteElementString("CreatorData", inventoryItem.CreatorData); | 281 | writer.WriteElementString("CreatorData", inventoryItem.CreatorData); |
| 282 | else if (options.ContainsKey("home")) | 282 | else if (options.ContainsKey("home")) |
| 283 | { | 283 | { |