From 002336e95c928405394c18eb7d7e77e7b15bd259 Mon Sep 17 00:00:00 2001
From: gareth
Date: Mon, 30 Apr 2007 02:48:05 +0000
Subject: Done some more conversion work on the asset server

---
 OpenSim.GridInterfaces/Local/LocalGridServer.cs    | 9 +--------
 OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | 7 ++++---
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'OpenSim.GridInterfaces')

diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index f4b8872..e08d635 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -145,12 +145,5 @@ namespace OpenSim.GridInterfaces.Local
 			return (asset.UUID == _findID);
 		}
 	}
-	
-	public class AssetStorage
-	{
-		public byte[] Data;
-		public sbyte Type;
-		public string Name;
-		public LLUUID UUID;
-	}
+		
 }
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index d2f8de1..bcebf82 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -62,11 +62,12 @@ namespace OpenSim.GridInterfaces.Remote
         {
             while (true)
             {
-                //we need to add support for the asset server not knowing about a requested asset
+                //we need to add support for the asset server not knowing about a requested asset
+		// 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
                 ARequest req = this._assetRequests.Dequeue();
                 LLUUID assetID = req.AssetID;
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
-                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID + "/data");
+                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID + "/data");
                 WebResponse AssetResponse = AssetLoad.GetResponse();
                 byte[] idata = new byte[(int)AssetResponse.ContentLength];
                 BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
-- 
cgit v1.1