diff options
author | Justin Clarke Casey | 2008-12-01 19:23:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-01 19:23:12 +0000 |
commit | 2cf0be7d58b9b43123e0410e6efa1c774d9d26b3 (patch) | |
tree | 6d7b79d07f94b7be550c0b4aaadfa743ef136289 /OpenSim | |
parent | Fix the terrain loader (diff) | |
download | opensim-SC_OLD-2cf0be7d58b9b43123e0410e6efa1c774d9d26b3.zip opensim-SC_OLD-2cf0be7d58b9b43123e0410e6efa1c774d9d26b3.tar.gz opensim-SC_OLD-2cf0be7d58b9b43123e0410e6efa1c774d9d26b3.tar.bz2 opensim-SC_OLD-2cf0be7d58b9b43123e0410e6efa1c774d9d26b3.tar.xz |
* Assume that asset data in a reset inventory post is not inlined by default
* This means that the xml of a get request can be used as the input with a few value tweaks, instead of having to explicitly put inline="false" in the output xml
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 11ae75f..913eb0c 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -1243,7 +1243,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1243 | /// <param name=rdata>HTTP service request work area</param> | 1243 | /// <param name=rdata>HTTP service request work area</param> |
1244 | /// <param name=folder>The folder to be searched (parent)</param> | 1244 | /// <param name=folder>The folder to be searched (parent)</param> |
1245 | /// <param name=indent>pretty print indentation</param> | 1245 | /// <param name=indent>pretty print indentation</param> |
1246 | |||
1247 | private void formatInventory(InventoryRequestData rdata, InventoryFolderBase folder, string indent) | 1246 | private void formatInventory(InventoryRequestData rdata, InventoryFolderBase folder, string indent) |
1248 | { | 1247 | { |
1249 | if (Rest.DEBUG) | 1248 | if (Rest.DEBUG) |
@@ -1325,7 +1324,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1325 | rdata.writer.WriteAttributeString("everyone", String.Empty, i.EveryOnePermissions.ToString("X")); | 1324 | rdata.writer.WriteAttributeString("everyone", String.Empty, i.EveryOnePermissions.ToString("X")); |
1326 | rdata.writer.WriteAttributeString("base", String.Empty, i.BasePermissions.ToString("X")); | 1325 | rdata.writer.WriteAttributeString("base", String.Empty, i.BasePermissions.ToString("X")); |
1327 | rdata.writer.WriteEndElement(); | 1326 | rdata.writer.WriteEndElement(); |
1328 | 1327 | ||
1329 | rdata.writer.WriteElementString("Asset", i.AssetID.ToString()); | 1328 | rdata.writer.WriteElementString("Asset", i.AssetID.ToString()); |
1330 | 1329 | ||
1331 | rdata.writer.WriteEndElement(); | 1330 | rdata.writer.WriteEndElement(); |
@@ -1795,7 +1794,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1795 | bool local = false; | 1794 | bool local = false; |
1796 | 1795 | ||
1797 | // This is not a persistent attribute | 1796 | // This is not a persistent attribute |
1798 | bool inline = true; | 1797 | bool inline = false; |
1799 | 1798 | ||
1800 | UUID uuid = UUID.Zero; | 1799 | UUID uuid = UUID.Zero; |
1801 | 1800 | ||