diff options
author | Dr Scofield | 2008-08-20 15:28:51 +0000 |
---|---|---|
committer | Dr Scofield | 2008-08-20 15:28:51 +0000 |
commit | 2363cd2113261ac456e18f79e9e37622d2c7eca7 (patch) | |
tree | c58698b7269653d0df5adab697f66d86a425036e /OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |
parent | oops. forgot. (diff) | |
download | opensim-SC-2363cd2113261ac456e18f79e9e37622d2c7eca7.zip opensim-SC-2363cd2113261ac456e18f79e9e37622d2c7eca7.tar.gz opensim-SC-2363cd2113261ac456e18f79e9e37622d2c7eca7.tar.bz2 opensim-SC-2363cd2113261ac456e18f79e9e37622d2c7eca7.tar.xz |
fixing Rest/Inventory stuff again. changes somehow got lost locally.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 6a0fdf2..1ea598e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -128,9 +128,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
128 | /// <param name=qPrefix>REST service domain prefix</param> | 128 | /// <param name=qPrefix>REST service domain prefix</param> |
129 | /// <returns>A RequestData instance suitable for this service</returns> | 129 | /// <returns>A RequestData instance suitable for this service</returns> |
130 | 130 | ||
131 | private RequestData Allocate(OSHttpRequest request, OSHttpResponse response) | 131 | private RequestData Allocate(OSHttpRequest request, OSHttpResponse response, string prefix) |
132 | { | 132 | { |
133 | return (RequestData) new InventoryRequestData(request, response, qPrefix); | 133 | return (RequestData) new InventoryRequestData(request, response, prefix); |
134 | } | 134 | } |
135 | 135 | ||
136 | /// <summary> | 136 | /// <summary> |
@@ -2168,7 +2168,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2168 | } | 2168 | } |
2169 | break; | 2169 | break; |
2170 | default : | 2170 | default : |
2171 | Rest.Log.DebugFormat("{0} Type was not inferred", MsgId); | 2171 | Rest.Log.DebugFormat("{0} Asset/Inventory type could not be inferred for {1}", |
2172 | MsgId,ic.Item.Name); | ||
2172 | break; | 2173 | break; |
2173 | } | 2174 | } |
2174 | } | 2175 | } |
@@ -2177,7 +2178,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2177 | /// If this is a TGA remember the fact | 2178 | /// If this is a TGA remember the fact |
2178 | 2179 | ||
2179 | if (ic.Item.AssetType == (int) AssetType.TextureTGA || | 2180 | if (ic.Item.AssetType == (int) AssetType.TextureTGA || |
2180 | ic.Item.AssetType == (int) AssetType.ImageTGA) | 2181 | ic.Item.AssetType == (int) AssetType.ImageTGA) |
2181 | { | 2182 | { |
2182 | Bitmap temp; | 2183 | Bitmap temp; |
2183 | Stream tgadata = new MemoryStream(ic.Asset.Data); | 2184 | Stream tgadata = new MemoryStream(ic.Asset.Data); |