aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
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/ApplicationPlugins
parent* Fix the remainder of the packets that require sessionId checks. (diff)
downloadopensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2
opensim-SC_OLD-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 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 95e3d71..f0d9946 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -1293,7 +1293,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1293 rdata.writer.WriteAttributeString("uuid", String.Empty, i.ID.ToString()); 1293 rdata.writer.WriteAttributeString("uuid", String.Empty, i.ID.ToString());
1294 rdata.writer.WriteAttributeString("folder", String.Empty, i.Folder.ToString()); 1294 rdata.writer.WriteAttributeString("folder", String.Empty, i.Folder.ToString());
1295 rdata.writer.WriteAttributeString("owner", String.Empty, i.Owner.ToString()); 1295 rdata.writer.WriteAttributeString("owner", String.Empty, i.Owner.ToString());
1296 rdata.writer.WriteAttributeString("creator", String.Empty, i.Creator.ToString()); 1296 rdata.writer.WriteAttributeString("creator", String.Empty, i.CreatorId);
1297 rdata.writer.WriteAttributeString("creationdate", String.Empty, i.CreationDate.ToString()); 1297 rdata.writer.WriteAttributeString("creationdate", String.Empty, i.CreationDate.ToString());
1298 rdata.writer.WriteAttributeString("invtype", String.Empty, i.InvType.ToString()); 1298 rdata.writer.WriteAttributeString("invtype", String.Empty, i.InvType.ToString());
1299 rdata.writer.WriteAttributeString("assettype", String.Empty, i.AssetType.ToString()); 1299 rdata.writer.WriteAttributeString("assettype", String.Empty, i.AssetType.ToString());
@@ -1392,7 +1392,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1392 || newf.Folder != oldf.Folder 1392 || newf.Folder != oldf.Folder
1393 || newf.Description != oldf.Description 1393 || newf.Description != oldf.Description
1394 || newf.Owner != oldf.Owner 1394 || newf.Owner != oldf.Owner
1395 || newf.Creator != oldf.Creator 1395 || newf.CreatorId != oldf.CreatorId
1396 || newf.AssetID != oldf.AssetID 1396 || newf.AssetID != oldf.AssetID
1397 || newf.GroupID != oldf.GroupID 1397 || newf.GroupID != oldf.GroupID
1398 || newf.GroupOwned != oldf.GroupOwned 1398 || newf.GroupOwned != oldf.GroupOwned
@@ -1676,7 +1676,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1676 result.ID = UUID.Zero; 1676 result.ID = UUID.Zero;
1677 result.Folder = UUID.Zero; 1677 result.Folder = UUID.Zero;
1678 result.Owner = ic.UserID; 1678 result.Owner = ic.UserID;
1679 result.Creator = ic.UserID; 1679 result.CreatorId = ic.UserID.ToString();
1680 result.AssetID = UUID.Zero; 1680 result.AssetID = UUID.Zero;
1681 result.GroupID = UUID.Zero; 1681 result.GroupID = UUID.Zero;
1682 result.GroupOwned = false; 1682 result.GroupOwned = false;
@@ -1710,7 +1710,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1710 result.InvType = Int32.Parse(ic.xml.Value); 1710 result.InvType = Int32.Parse(ic.xml.Value);
1711 break; 1711 break;
1712 case "creator": 1712 case "creator":
1713 result.Creator = new UUID(ic.xml.Value); 1713 result.CreatorId = ic.xml.Value;
1714 break; 1714 break;
1715 case "assettype": 1715 case "assettype":
1716 result.AssetType = Int32.Parse(ic.xml.Value); 1716 result.AssetType = Int32.Parse(ic.xml.Value);