diff options
author | gareth | 2007-04-30 02:48:05 +0000 |
---|---|---|
committer | gareth | 2007-04-30 02:48:05 +0000 |
commit | 002336e95c928405394c18eb7d7e77e7b15bd259 (patch) | |
tree | df9b61f3555866623bf8b2ddcd500914766f2f59 /OpenSim.GridInterfaces | |
parent | Copied gridserver ready to convert to asset server (diff) | |
download | opensim-SC-002336e95c928405394c18eb7d7e77e7b15bd259.zip opensim-SC-002336e95c928405394c18eb7d7e77e7b15bd259.tar.gz opensim-SC-002336e95c928405394c18eb7d7e77e7b15bd259.tar.bz2 opensim-SC-002336e95c928405394c18eb7d7e77e7b15bd259.tar.xz |
Done some more conversion work on the asset server
Diffstat (limited to 'OpenSim.GridInterfaces')
-rw-r--r-- | OpenSim.GridInterfaces/Local/LocalGridServer.cs | 9 | ||||
-rw-r--r-- | OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | 7 |
2 files changed, 5 insertions, 11 deletions
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 | |||
145 | return (asset.UUID == _findID); | 145 | return (asset.UUID == _findID); |
146 | } | 146 | } |
147 | } | 147 | } |
148 | 148 | ||
149 | public class AssetStorage | ||
150 | { | ||
151 | public byte[] Data; | ||
152 | public sbyte Type; | ||
153 | public string Name; | ||
154 | public LLUUID UUID; | ||
155 | } | ||
156 | } | 149 | } |
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 | |||
62 | { | 62 | { |
63 | while (true) | 63 | while (true) |
64 | { | 64 | { |
65 | //we need to add support for the asset server not knowing about a requested asset | 65 | //we need to add support for the asset server not knowing about a requested asset |
66 | // 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 | ||
66 | ARequest req = this._assetRequests.Dequeue(); | 67 | ARequest req = this._assetRequests.Dequeue(); |
67 | LLUUID assetID = req.AssetID; | 68 | LLUUID assetID = req.AssetID; |
68 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data"); | 69 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID + "/data"); |
69 | WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data"); | 70 | WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID + "/data"); |
70 | WebResponse AssetResponse = AssetLoad.GetResponse(); | 71 | WebResponse AssetResponse = AssetLoad.GetResponse(); |
71 | byte[] idata = new byte[(int)AssetResponse.ContentLength]; | 72 | byte[] idata = new byte[(int)AssetResponse.ContentLength]; |
72 | BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream()); | 73 | BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream()); |