aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetInventoryServer/Utils.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-08 17:50:57 +0000
committerJustin Clarke Casey2009-04-08 17:50:57 +0000
commitf3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 (patch)
treecdcef4e023e1adf8bb4a83e5ebe81448dbf33c6b /OpenSim/Grid/AssetInventoryServer/Utils.cs
parent* Fix the remainder of the packets that require sessionId checks. (diff)
downloadopensim-SC-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip
opensim-SC-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz
opensim-SC-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2
opensim-SC-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.xz
* Make it possible to store creator strings in user inventory items as well as UUIDs
* All existing functionality should be unaffected. * Database schemas have not been changed.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Utils.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs
index 58b0c67..c79a426 100644
--- a/OpenSim/Grid/AssetInventoryServer/Utils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs
@@ -515,7 +515,7 @@ namespace OpenSim.Grid.AssetInventoryServer
515 else if (Reader.LocalName == "Creator" && Reader.NamespaceURI == "" && !b13) 515 else if (Reader.LocalName == "Creator" && Reader.NamespaceURI == "" && !b13)
516 { 516 {
517 b13 = true; 517 b13 = true;
518 ob.@Creator = ReadObject_UUID(false, true); 518 ob.@CreatorId = Reader.ReadElementString();
519 } 519 }
520 else if (Reader.LocalName == "Owner" && Reader.NamespaceURI == "" && !b12) 520 else if (Reader.LocalName == "Owner" && Reader.NamespaceURI == "" && !b12)
521 { 521 {
@@ -876,7 +876,7 @@ namespace OpenSim.Grid.AssetInventoryServer
876 WriteElementString("InvType", "", ob.@InvType.ToString(CultureInfo.InvariantCulture)); 876 WriteElementString("InvType", "", ob.@InvType.ToString(CultureInfo.InvariantCulture));
877 WriteObject_UUID(ob.@Folder, "Folder", "", false, false, true); 877 WriteObject_UUID(ob.@Folder, "Folder", "", false, false, true);
878 WriteObject_UUID(ob.@Owner, "Owner", "", false, false, true); 878 WriteObject_UUID(ob.@Owner, "Owner", "", false, false, true);
879 WriteObject_UUID(ob.@Creator, "Creator", "", false, false, true); 879 WriteElementString("Creator", "", ob.@CreatorId);
880 WriteElementString("Name", "", ob.@Name); 880 WriteElementString("Name", "", ob.@Name);
881 WriteElementString("Description", "", ob.@Description); 881 WriteElementString("Description", "", ob.@Description);
882 WriteElementString("NextPermissions", "", ob.@NextPermissions.ToString(CultureInfo.InvariantCulture)); 882 WriteElementString("NextPermissions", "", ob.@NextPermissions.ToString(CultureInfo.InvariantCulture));