aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
committerJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
commit2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch)
tree95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/Framework/Serialization
parentChange SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff)
parentMerge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization')
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index f6fdc4b..57da7ca 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -279,14 +279,14 @@ namespace OpenSim.Framework.Serialization.External
279 writer.WriteEndElement(); 279 writer.WriteEndElement();
280 if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty) 280 if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
281 writer.WriteElementString("CreatorData", inventoryItem.CreatorData); 281 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
282 else if (options.ContainsKey("profile")) 282 else if (options.ContainsKey("home"))
283 { 283 {
284 if (userAccountService != null) 284 if (userAccountService != null)
285 { 285 {
286 UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid); 286 UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid);
287 if (account != null) 287 if (account != null)
288 { 288 {
289 writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName); 289 writer.WriteElementString("CreatorData", (string)options["home"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
290 } 290 }
291 writer.WriteElementString("CreatorID", inventoryItem.CreatorId); 291 writer.WriteElementString("CreatorID", inventoryItem.CreatorId);
292 } 292 }