diff options
author | Adam Frisby | 2007-07-11 08:02:47 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-11 08:02:47 +0000 |
commit | 5c7ffdde0b9642a42e8f5987e06eb01220ff7776 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /OpenSim/OpenSim.GridInterfaces | |
parent | Who would have known that the only way of specifying utf-8 without preamble, ... (diff) | |
download | opensim-SC_OLD-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.zip opensim-SC_OLD-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.gz opensim-SC_OLD-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.bz2 opensim-SC_OLD-5c7ffdde0b9642a42e8f5987e06eb01220ff7776.tar.xz |
* Wiping trunk in prep for Sugilite
Diffstat (limited to '')
10 files changed, 0 insertions, 1233 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs deleted file mode 100644 index 52ecd6b..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System.Reflection; | ||
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | ||
31 | |||
32 | // Information about this assembly is defined by the following | ||
33 | // attributes. | ||
34 | // | ||
35 | // change them to the information which is associated with the assembly | ||
36 | // you compile. | ||
37 | |||
38 | [assembly: AssemblyTitle("LocalGridServers")] | ||
39 | [assembly: AssemblyDescription("")] | ||
40 | [assembly: AssemblyConfiguration("")] | ||
41 | [assembly: AssemblyCompany("")] | ||
42 | [assembly: AssemblyProduct("LocalGridServers")] | ||
43 | [assembly: AssemblyCopyright("")] | ||
44 | [assembly: AssemblyTrademark("")] | ||
45 | [assembly: AssemblyCulture("")] | ||
46 | |||
47 | // This sets the default COM visibility of types in the assembly to invisible. | ||
48 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
49 | [assembly: ComVisible(false)] | ||
50 | |||
51 | // The assembly version has following format : | ||
52 | // | ||
53 | // Major.Minor.Build.Revision | ||
54 | // | ||
55 | // You can specify all values by your own or you can build default build and revision | ||
56 | // numbers with the '*' character (the default): | ||
57 | |||
58 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs deleted file mode 100644 index ea4cbc7..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs +++ /dev/null | |||
@@ -1,298 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Threading; | ||
32 | using System.IO; | ||
33 | using OpenSim.Framework.Interfaces; | ||
34 | using OpenSim.Framework.Types; | ||
35 | using OpenSim.Framework.Utilities; | ||
36 | using OpenSim.Framework.Console; | ||
37 | using libsecondlife; | ||
38 | using Db4objects.Db4o; | ||
39 | using Db4objects.Db4o.Query; | ||
40 | |||
41 | namespace OpenSim.GridInterfaces.Local | ||
42 | { | ||
43 | public class LocalAssetPlugin : IAssetPlugin | ||
44 | { | ||
45 | public LocalAssetPlugin() | ||
46 | { | ||
47 | |||
48 | } | ||
49 | |||
50 | public IAssetServer GetAssetServer() | ||
51 | { | ||
52 | return (new LocalAssetServer()); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | public class LocalAssetServer : IAssetServer | ||
57 | { | ||
58 | private IAssetReceiver _receiver; | ||
59 | private BlockingQueue<ARequest> _assetRequests; | ||
60 | private IObjectContainer db; | ||
61 | private Thread _localAssetServerThread; | ||
62 | |||
63 | public LocalAssetServer() | ||
64 | { | ||
65 | bool yapfile; | ||
66 | this._assetRequests = new BlockingQueue<ARequest>(); | ||
67 | yapfile = System.IO.File.Exists("assets.yap"); | ||
68 | |||
69 | MainConsole.Instance.Verbose("Local Asset Server class created"); | ||
70 | try | ||
71 | { | ||
72 | db = Db4oFactory.OpenFile("assets.yap"); | ||
73 | MainConsole.Instance.Verbose("Db4 Asset database creation"); | ||
74 | } | ||
75 | catch (Exception e) | ||
76 | { | ||
77 | db.Close(); | ||
78 | MainConsole.Instance.Warn("Db4 Asset server :Constructor - Exception occured"); | ||
79 | MainConsole.Instance.Warn(e.ToString()); | ||
80 | } | ||
81 | if (!yapfile) | ||
82 | { | ||
83 | this.SetUpAssetDatabase(); | ||
84 | } | ||
85 | this._localAssetServerThread = new Thread(new ThreadStart(RunRequests)); | ||
86 | this._localAssetServerThread.IsBackground = true; | ||
87 | this._localAssetServerThread.Start(); | ||
88 | |||
89 | } | ||
90 | |||
91 | public void SetReceiver(IAssetReceiver receiver) | ||
92 | { | ||
93 | this._receiver = receiver; | ||
94 | } | ||
95 | |||
96 | public void RequestAsset(LLUUID assetID, bool isTexture) | ||
97 | { | ||
98 | ARequest req = new ARequest(); | ||
99 | req.AssetID = assetID; | ||
100 | req.IsTexture = isTexture; | ||
101 | this._assetRequests.Enqueue(req); | ||
102 | } | ||
103 | |||
104 | public void UpdateAsset(AssetBase asset) | ||
105 | { | ||
106 | |||
107 | } | ||
108 | |||
109 | public void UploadNewAsset(AssetBase asset) | ||
110 | { | ||
111 | AssetStorage store = new AssetStorage(); | ||
112 | store.Data = asset.Data; | ||
113 | store.Name = asset.Name; | ||
114 | store.UUID = asset.FullID; | ||
115 | db.Set(store); | ||
116 | db.Commit(); | ||
117 | } | ||
118 | |||
119 | public void SetServerInfo(string ServerUrl, string ServerKey) | ||
120 | { | ||
121 | |||
122 | } | ||
123 | public void Close() | ||
124 | { | ||
125 | if (db != null) | ||
126 | { | ||
127 | MainConsole.Instance.Verbose( "Closing local asset server database"); | ||
128 | db.Close(); | ||
129 | } | ||
130 | } | ||
131 | |||
132 | private void RunRequests() | ||
133 | { | ||
134 | while (true) | ||
135 | { | ||
136 | byte[] idata = null; | ||
137 | bool found = false; | ||
138 | AssetStorage foundAsset = null; | ||
139 | ARequest req = this._assetRequests.Dequeue(); | ||
140 | IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID)); | ||
141 | if (result.Count > 0) | ||
142 | { | ||
143 | foundAsset = (AssetStorage)result.Next(); | ||
144 | found = true; | ||
145 | } | ||
146 | |||
147 | AssetBase asset = new AssetBase(); | ||
148 | if (found) | ||
149 | { | ||
150 | asset.FullID = foundAsset.UUID; | ||
151 | asset.Type = foundAsset.Type; | ||
152 | asset.InvType = foundAsset.Type; | ||
153 | asset.Name = foundAsset.Name; | ||
154 | idata = foundAsset.Data; | ||
155 | } | ||
156 | else | ||
157 | { | ||
158 | asset.FullID = LLUUID.Zero; | ||
159 | } | ||
160 | asset.Data = idata; | ||
161 | _receiver.AssetReceived(asset, req.IsTexture); | ||
162 | } | ||
163 | |||
164 | } | ||
165 | |||
166 | private void SetUpAssetDatabase() | ||
167 | { | ||
168 | try | ||
169 | { | ||
170 | |||
171 | MainConsole.Instance.Verbose( "Setting up asset database"); | ||
172 | |||
173 | AssetBase Image = new AssetBase(); | ||
174 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); | ||
175 | Image.Name = "Bricks"; | ||
176 | this.LoadAsset(Image, true, "bricks.jp2"); | ||
177 | AssetStorage store = new AssetStorage(); | ||
178 | store.Data = Image.Data; | ||
179 | store.Name = Image.Name; | ||
180 | store.UUID = Image.FullID; | ||
181 | db.Set(store); | ||
182 | db.Commit(); | ||
183 | |||
184 | Image = new AssetBase(); | ||
185 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002"); | ||
186 | Image.Name = "Plywood"; | ||
187 | this.LoadAsset(Image, true, "plywood.jp2"); | ||
188 | store = new AssetStorage(); | ||
189 | store.Data = Image.Data; | ||
190 | store.Name = Image.Name; | ||
191 | store.UUID = Image.FullID; | ||
192 | db.Set(store); | ||
193 | db.Commit(); | ||
194 | |||
195 | Image = new AssetBase(); | ||
196 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003"); | ||
197 | Image.Name = "Rocks"; | ||
198 | this.LoadAsset(Image, true, "rocks.jp2"); | ||
199 | store = new AssetStorage(); | ||
200 | store.Data = Image.Data; | ||
201 | store.Name = Image.Name; | ||
202 | store.UUID = Image.FullID; | ||
203 | db.Set(store); | ||
204 | db.Commit(); | ||
205 | |||
206 | Image = new AssetBase(); | ||
207 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004"); | ||
208 | Image.Name = "Granite"; | ||
209 | this.LoadAsset(Image, true, "granite.jp2"); | ||
210 | store = new AssetStorage(); | ||
211 | store.Data = Image.Data; | ||
212 | store.Name = Image.Name; | ||
213 | store.UUID = Image.FullID; | ||
214 | db.Set(store); | ||
215 | db.Commit(); | ||
216 | |||
217 | Image = new AssetBase(); | ||
218 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005"); | ||
219 | Image.Name = "Hardwood"; | ||
220 | this.LoadAsset(Image, true, "hardwood.jp2"); | ||
221 | store = new AssetStorage(); | ||
222 | store.Data = Image.Data; | ||
223 | store.Name = Image.Name; | ||
224 | store.UUID = Image.FullID; | ||
225 | db.Set(store); | ||
226 | db.Commit(); | ||
227 | |||
228 | Image = new AssetBase(); | ||
229 | Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005"); | ||
230 | Image.Name = "Prim Base Texture"; | ||
231 | this.LoadAsset(Image, true, "plywood.jp2"); | ||
232 | store = new AssetStorage(); | ||
233 | store.Data = Image.Data; | ||
234 | store.Name = Image.Name; | ||
235 | store.UUID = Image.FullID; | ||
236 | db.Set(store); | ||
237 | db.Commit(); | ||
238 | |||
239 | Image = new AssetBase(); | ||
240 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006"); | ||
241 | Image.Name = "Map Base Texture"; | ||
242 | this.LoadAsset(Image, true, "map_base.jp2"); | ||
243 | store = new AssetStorage(); | ||
244 | store.Data = Image.Data; | ||
245 | store.Name = Image.Name; | ||
246 | store.UUID = Image.FullID; | ||
247 | db.Set(store); | ||
248 | db.Commit(); | ||
249 | |||
250 | Image = new AssetBase(); | ||
251 | Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007"); | ||
252 | Image.Name = "Map Texture"; | ||
253 | this.LoadAsset(Image, true, "map1.jp2"); | ||
254 | store = new AssetStorage(); | ||
255 | store.Data = Image.Data; | ||
256 | store.Name = Image.Name; | ||
257 | store.UUID = Image.FullID; | ||
258 | db.Set(store); | ||
259 | db.Commit(); | ||
260 | |||
261 | Image = new AssetBase(); | ||
262 | Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | ||
263 | Image.Name = "Shape"; | ||
264 | this.LoadAsset(Image, false, "base_shape.dat"); | ||
265 | store = new AssetStorage(); | ||
266 | store.Data = Image.Data; | ||
267 | store.Name = Image.Name; | ||
268 | store.UUID = Image.FullID; | ||
269 | db.Set(store); | ||
270 | db.Commit(); | ||
271 | } | ||
272 | catch (Exception e) | ||
273 | { | ||
274 | MainConsole.Instance.Error(e.Message); | ||
275 | } | ||
276 | |||
277 | } | ||
278 | |||
279 | private void LoadAsset(AssetBase info, bool image, string filename) | ||
280 | { | ||
281 | //should request Asset from storage manager | ||
282 | //but for now read from file | ||
283 | |||
284 | string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; | ||
285 | string fileName = Path.Combine(dataPath, filename); | ||
286 | FileInfo fInfo = new FileInfo(fileName); | ||
287 | long numBytes = fInfo.Length; | ||
288 | FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read); | ||
289 | byte[] idata = new byte[numBytes]; | ||
290 | BinaryReader br = new BinaryReader(fStream); | ||
291 | idata = br.ReadBytes((int)numBytes); | ||
292 | br.Close(); | ||
293 | fStream.Close(); | ||
294 | info.Data = idata; | ||
295 | //info.loaded=true; | ||
296 | } | ||
297 | } | ||
298 | } | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs deleted file mode 100644 index 9b6a9ff..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs +++ /dev/null | |||
@@ -1,158 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Threading; | ||
31 | using System.IO; | ||
32 | using OpenSim.Framework.Interfaces; | ||
33 | using OpenSim.Framework.Types; | ||
34 | using OpenSim.Framework.Console; | ||
35 | using libsecondlife; | ||
36 | using Db4objects.Db4o; | ||
37 | using Db4objects.Db4o.Query; | ||
38 | using System.Collections; | ||
39 | |||
40 | namespace OpenSim.GridInterfaces.Local | ||
41 | { | ||
42 | /// <summary> | ||
43 | /// | ||
44 | /// </summary> | ||
45 | /// | ||
46 | public class LocalGridPlugin : IGridPlugin | ||
47 | { | ||
48 | public LocalGridPlugin() | ||
49 | { | ||
50 | |||
51 | } | ||
52 | |||
53 | public IGridServer GetGridServer() | ||
54 | { | ||
55 | return(new LocalGridServer()); | ||
56 | } | ||
57 | } | ||
58 | |||
59 | public class LocalGridServer : LocalGridBase | ||
60 | { | ||
61 | public List<Login> Sessions = new List<Login>(); | ||
62 | |||
63 | public LocalGridServer() | ||
64 | { | ||
65 | Sessions = new List<Login>(); | ||
66 | MainConsole.Instance.Verbose("Local Grid Server class created"); | ||
67 | } | ||
68 | |||
69 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) | ||
70 | { | ||
71 | return true; | ||
72 | } | ||
73 | |||
74 | public override string GetName() | ||
75 | { | ||
76 | return "Local"; | ||
77 | } | ||
78 | |||
79 | public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) | ||
80 | { | ||
81 | //we are running local | ||
82 | AuthenticateResponse user = new AuthenticateResponse(); | ||
83 | |||
84 | lock(this.Sessions) | ||
85 | { | ||
86 | |||
87 | for(int i = 0; i < Sessions.Count; i++) | ||
88 | { | ||
89 | if((Sessions[i].Agent == agentID) && (Sessions[i].Session == sessionID)) | ||
90 | { | ||
91 | user.Authorised = true; | ||
92 | user.LoginInfo = Sessions[i]; | ||
93 | } | ||
94 | } | ||
95 | } | ||
96 | return(user); | ||
97 | } | ||
98 | |||
99 | public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) | ||
100 | { | ||
101 | return(true); | ||
102 | } | ||
103 | |||
104 | public override UUIDBlock RequestUUIDBlock() | ||
105 | { | ||
106 | UUIDBlock uuidBlock = new UUIDBlock(); | ||
107 | return(uuidBlock); | ||
108 | } | ||
109 | |||
110 | public override NeighbourInfo[] RequestNeighbours() | ||
111 | { | ||
112 | return null; | ||
113 | } | ||
114 | |||
115 | public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey) | ||
116 | { | ||
117 | |||
118 | } | ||
119 | |||
120 | public override IList RequestMapBlocks(int minX, int minY, int maxX, int maxY) | ||
121 | { | ||
122 | return new ArrayList(); | ||
123 | } | ||
124 | |||
125 | |||
126 | public override void Close() | ||
127 | { | ||
128 | |||
129 | } | ||
130 | |||
131 | /// <summary> | ||
132 | /// used by the local login server to inform us of new sessions | ||
133 | /// </summary> | ||
134 | /// <param name="session"></param> | ||
135 | public override void AddNewSession(Login session) | ||
136 | { | ||
137 | lock(this.Sessions) | ||
138 | { | ||
139 | this.Sessions.Add(session); | ||
140 | } | ||
141 | } | ||
142 | } | ||
143 | |||
144 | public class AssetUUIDQuery : Predicate | ||
145 | { | ||
146 | private LLUUID _findID; | ||
147 | |||
148 | public AssetUUIDQuery(LLUUID find) | ||
149 | { | ||
150 | _findID = find; | ||
151 | } | ||
152 | public bool Match(AssetStorage asset) | ||
153 | { | ||
154 | return (asset.UUID == _findID); | ||
155 | } | ||
156 | } | ||
157 | |||
158 | } | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj deleted file mode 100644 index 1acd1b5..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <ProjectType>Local</ProjectType> | ||
4 | <ProductVersion>8.0.50727</ProductVersion> | ||
5 | <SchemaVersion>2.0</SchemaVersion> | ||
6 | <ProjectGuid>{546099CD-0000-0000-0000-000000000000}</ProjectGuid> | ||
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenSim.GridInterfaces.Local</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Library</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenSim.GridInterfaces.Local</RootNamespace> | ||
20 | <StartupObject></StartupObject> | ||
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
23 | </PropertyGroup> | ||
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
26 | <BaseAddress>285212672</BaseAddress> | ||
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
28 | <ConfigurationOverrideFile> | ||
29 | </ConfigurationOverrideFile> | ||
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\..\..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
39 | <WarningLevel>4</WarningLevel> | ||
40 | <NoWarn></NoWarn> | ||
41 | </PropertyGroup> | ||
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
44 | <BaseAddress>285212672</BaseAddress> | ||
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
48 | <DefineConstants>TRACE</DefineConstants> | ||
49 | <DocumentationFile></DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\..\..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
57 | <WarningLevel>4</WarningLevel> | ||
58 | <NoWarn></NoWarn> | ||
59 | </PropertyGroup> | ||
60 | <ItemGroup> | ||
61 | <Reference Include="Db4objects.Db4o.dll" > | ||
62 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="libsecondlife.dll" > | ||
66 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System" > | ||
70 | <HintPath>System.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="System.Xml" > | ||
74 | <HintPath>System.Xml.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | </ItemGroup> | ||
78 | <ItemGroup> | ||
79 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
80 | <Name>OpenSim.Framework</Name> | ||
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
83 | <Private>False</Private> | ||
84 | </ProjectReference> | ||
85 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
86 | <Name>OpenSim.Framework.Console</Name> | ||
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
89 | <Private>False</Private> | ||
90 | </ProjectReference> | ||
91 | </ItemGroup> | ||
92 | <ItemGroup> | ||
93 | <Compile Include="AssemblyInfo.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="LocalAssetServer.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
99 | <Compile Include="LocalGridServer.cs"> | ||
100 | <SubType>Code</SubType> | ||
101 | </Compile> | ||
102 | </ItemGroup> | ||
103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
104 | <PropertyGroup> | ||
105 | <PreBuildEvent> | ||
106 | </PreBuildEvent> | ||
107 | <PostBuildEvent> | ||
108 | </PostBuildEvent> | ||
109 | </PropertyGroup> | ||
110 | </Project> | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build deleted file mode 100644 index c3c4ae4..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.GridInterfaces.Local" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="LocalAssetServer.cs" /> | ||
16 | <include name="LocalGridServer.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
24 | <include name="../../../bin/libsecondlife.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="System.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs deleted file mode 100644 index 51596d0..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System.Reflection; | ||
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | ||
31 | |||
32 | // Information about this assembly is defined by the following | ||
33 | // attributes. | ||
34 | // | ||
35 | // change them to the information which is associated with the assembly | ||
36 | // you compile. | ||
37 | |||
38 | [assembly: AssemblyTitle("RemoteGridServers")] | ||
39 | [assembly: AssemblyDescription("")] | ||
40 | [assembly: AssemblyConfiguration("")] | ||
41 | [assembly: AssemblyCompany("")] | ||
42 | [assembly: AssemblyProduct("RemoteGridServers")] | ||
43 | [assembly: AssemblyCopyright("")] | ||
44 | [assembly: AssemblyTrademark("")] | ||
45 | [assembly: AssemblyCulture("")] | ||
46 | |||
47 | // This sets the default COM visibility of types in the assembly to invisible. | ||
48 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
49 | [assembly: ComVisible(false)] | ||
50 | |||
51 | // The assembly version has following format : | ||
52 | // | ||
53 | // Major.Minor.Build.Revision | ||
54 | // | ||
55 | // You can specify all values by your own or you can build default build and revision | ||
56 | // numbers with the '*' character (the default): | ||
57 | |||
58 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj deleted file mode 100644 index 11aacac..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <ProjectType>Local</ProjectType> | ||
4 | <ProductVersion>8.0.50727</ProductVersion> | ||
5 | <SchemaVersion>2.0</SchemaVersion> | ||
6 | <ProjectGuid>{B55C0B5D-0000-0000-0000-000000000000}</ProjectGuid> | ||
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenSim.GridInterfaces.Remote</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Library</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenSim.GridInterfaces.Remote</RootNamespace> | ||
20 | <StartupObject></StartupObject> | ||
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
23 | </PropertyGroup> | ||
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
26 | <BaseAddress>285212672</BaseAddress> | ||
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
28 | <ConfigurationOverrideFile> | ||
29 | </ConfigurationOverrideFile> | ||
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\..\..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
39 | <WarningLevel>4</WarningLevel> | ||
40 | <NoWarn></NoWarn> | ||
41 | </PropertyGroup> | ||
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
44 | <BaseAddress>285212672</BaseAddress> | ||
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
48 | <DefineConstants>TRACE</DefineConstants> | ||
49 | <DocumentationFile></DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\..\..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
57 | <WarningLevel>4</WarningLevel> | ||
58 | <NoWarn></NoWarn> | ||
59 | </PropertyGroup> | ||
60 | <ItemGroup> | ||
61 | <Reference Include="libsecondlife.dll" > | ||
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System" > | ||
66 | <HintPath>System.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Xml" > | ||
70 | <HintPath>System.Xml.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | </ItemGroup> | ||
74 | <ItemGroup> | ||
75 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
76 | <Name>OpenSim.Framework</Name> | ||
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
79 | <Private>False</Private> | ||
80 | </ProjectReference> | ||
81 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
82 | <Name>OpenSim.Framework.Console</Name> | ||
83 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
85 | <Private>False</Private> | ||
86 | </ProjectReference> | ||
87 | <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj"> | ||
88 | <Name>XMLRPC</Name> | ||
89 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
91 | <Private>False</Private> | ||
92 | </ProjectReference> | ||
93 | </ItemGroup> | ||
94 | <ItemGroup> | ||
95 | <Compile Include="AssemblyInfo.cs"> | ||
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="RemoteAssetServer.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="RemoteGridServer.cs"> | ||
102 | <SubType>Code</SubType> | ||
103 | </Compile> | ||
104 | </ItemGroup> | ||
105 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
106 | <PropertyGroup> | ||
107 | <PreBuildEvent> | ||
108 | </PreBuildEvent> | ||
109 | <PostBuildEvent> | ||
110 | </PostBuildEvent> | ||
111 | </PropertyGroup> | ||
112 | </Project> | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build deleted file mode 100644 index 860251f..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
9 | </copy> | ||
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | ||
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="RemoteAssetServer.cs" /> | ||
16 | <include name="RemoteGridServer.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Xml.dll" /> | ||
28 | <include name="../../../bin/XMLRPC.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs deleted file mode 100644 index 550fec6..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs +++ /dev/null | |||
@@ -1,135 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Threading; | ||
32 | using System.Net; | ||
33 | using System.Net.Sockets; | ||
34 | using System.IO; | ||
35 | using libsecondlife; | ||
36 | using OpenSim.Framework.Interfaces; | ||
37 | using OpenSim.Framework.Types; | ||
38 | using OpenSim.Framework.Utilities; | ||
39 | |||
40 | namespace OpenSim.GridInterfaces.Remote | ||
41 | { | ||
42 | public class RemoteAssetServer : IAssetServer | ||
43 | { | ||
44 | private IAssetReceiver _receiver; | ||
45 | private BlockingQueue<ARequest> _assetRequests; | ||
46 | private Thread _remoteAssetServerThread; | ||
47 | private string AssetServerUrl; | ||
48 | private string AssetSendKey; | ||
49 | |||
50 | public RemoteAssetServer() | ||
51 | { | ||
52 | this._assetRequests = new BlockingQueue<ARequest>(); | ||
53 | this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); | ||
54 | this._remoteAssetServerThread.IsBackground = true; | ||
55 | this._remoteAssetServerThread.Start(); | ||
56 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Remote Asset Server class created"); | ||
57 | } | ||
58 | |||
59 | public void SetReceiver(IAssetReceiver receiver) | ||
60 | { | ||
61 | this._receiver = receiver; | ||
62 | } | ||
63 | |||
64 | public void RequestAsset(LLUUID assetID, bool isTexture) | ||
65 | { | ||
66 | ARequest req = new ARequest(); | ||
67 | req.AssetID = assetID; | ||
68 | req.IsTexture = isTexture; | ||
69 | this._assetRequests.Enqueue(req); | ||
70 | } | ||
71 | |||
72 | public void UpdateAsset(AssetBase asset) | ||
73 | { | ||
74 | |||
75 | } | ||
76 | |||
77 | public void UploadNewAsset(AssetBase asset) | ||
78 | { | ||
79 | Encoding Windows1252Encoding = Encoding.GetEncoding(1252); | ||
80 | string ret = Windows1252Encoding.GetString(asset.Data); | ||
81 | byte[] buffer = Windows1252Encoding.GetBytes(ret); | ||
82 | WebClient client = new WebClient(); | ||
83 | client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer); | ||
84 | |||
85 | } | ||
86 | |||
87 | public void SetServerInfo(string ServerUrl, string ServerKey) | ||
88 | { | ||
89 | this.AssetServerUrl = ServerUrl; | ||
90 | this.AssetSendKey = ServerKey; | ||
91 | } | ||
92 | |||
93 | private void RunRequests() | ||
94 | { | ||
95 | while (true) | ||
96 | { | ||
97 | //we need to add support for the asset server not knowing about a requested asset | ||
98 | // 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 | ||
99 | ARequest req = this._assetRequests.Dequeue(); | ||
100 | LLUUID assetID = req.AssetID; | ||
101 | // OpenSim.Framework.Console.MainConsole.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); | ||
102 | WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); | ||
103 | WebResponse AssetResponse = AssetLoad.GetResponse(); | ||
104 | byte[] idata = new byte[(int)AssetResponse.ContentLength]; | ||
105 | BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream()); | ||
106 | idata = br.ReadBytes((int)AssetResponse.ContentLength); | ||
107 | br.Close(); | ||
108 | |||
109 | AssetBase asset = new AssetBase(); | ||
110 | asset.FullID = assetID; | ||
111 | asset.Data = idata; | ||
112 | _receiver.AssetReceived(asset, req.IsTexture); | ||
113 | } | ||
114 | } | ||
115 | |||
116 | public void Close() | ||
117 | { | ||
118 | |||
119 | } | ||
120 | } | ||
121 | |||
122 | public class RemoteAssetPlugin : IAssetPlugin | ||
123 | { | ||
124 | public RemoteAssetPlugin() | ||
125 | { | ||
126 | |||
127 | } | ||
128 | |||
129 | public IAssetServer GetAssetServer() | ||
130 | { | ||
131 | return (new RemoteAssetServer()); | ||
132 | } | ||
133 | } | ||
134 | |||
135 | } | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs deleted file mode 100644 index 7c93d43..0000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs +++ /dev/null | |||
@@ -1,212 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using System.Net; | ||
33 | using System.Net.Sockets; | ||
34 | using System.IO; | ||
35 | using libsecondlife; | ||
36 | using Nwc.XmlRpc; | ||
37 | using OpenSim.Framework.Interfaces; | ||
38 | using OpenSim.Framework.Types; | ||
39 | using OpenSim.Framework.Console; | ||
40 | |||
41 | namespace OpenSim.GridInterfaces.Remote | ||
42 | { | ||
43 | public class RemoteGridServer : RemoteGridBase | ||
44 | { | ||
45 | private string GridServerUrl; | ||
46 | private string GridSendKey; | ||
47 | private string GridRecvKey; | ||
48 | private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); | ||
49 | private ArrayList simneighbours = new ArrayList(); | ||
50 | private Hashtable griddatahash; | ||
51 | |||
52 | public override Dictionary<uint, AgentCircuitData> agentcircuits | ||
53 | { | ||
54 | get { return AgentCircuits; } | ||
55 | set { AgentCircuits = value; } | ||
56 | } | ||
57 | |||
58 | public override ArrayList neighbours | ||
59 | { | ||
60 | get { return simneighbours; } | ||
61 | set { simneighbours = value; } | ||
62 | } | ||
63 | |||
64 | public override Hashtable GridData | ||
65 | { | ||
66 | get { return griddatahash; } | ||
67 | set { griddatahash = value; } | ||
68 | } | ||
69 | |||
70 | |||
71 | public RemoteGridServer() | ||
72 | { | ||
73 | MainConsole.Instance.Notice("Remote Grid Server class created"); | ||
74 | } | ||
75 | |||
76 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) | ||
77 | { | ||
78 | Hashtable GridParams = new Hashtable(); | ||
79 | GridParams["authkey"] = GridSendKey; | ||
80 | GridParams["UUID"] = SimUUID.ToString(); | ||
81 | GridParams["sim_ip"] = sim_ip; | ||
82 | GridParams["sim_port"] = sim_port.ToString(); | ||
83 | ArrayList SendParams = new ArrayList(); | ||
84 | SendParams.Add(GridParams); | ||
85 | |||
86 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | ||
87 | XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); | ||
88 | Hashtable GridRespData = (Hashtable)GridResp.Value; | ||
89 | this.griddatahash = GridRespData; | ||
90 | |||
91 | if (GridRespData.ContainsKey("error")) | ||
92 | { | ||
93 | string errorstring = (string)GridRespData["error"]; | ||
94 | MainConsole.Instance.Warn("Error connecting to grid:"); | ||
95 | MainConsole.Instance.Warn(errorstring); | ||
96 | return false; | ||
97 | } | ||
98 | this.neighbours = (ArrayList)GridRespData["neighbours"]; | ||
99 | Console.WriteLine(simneighbours.Count); | ||
100 | return true; | ||
101 | } | ||
102 | |||
103 | public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) | ||
104 | { | ||
105 | AgentCircuitData validcircuit = null; | ||
106 | if (this.AgentCircuits.ContainsKey(circuitcode)) | ||
107 | { | ||
108 | validcircuit = this.AgentCircuits[circuitcode]; | ||
109 | } | ||
110 | AuthenticateResponse user = new AuthenticateResponse(); | ||
111 | if (validcircuit == null) | ||
112 | { | ||
113 | //don't have this circuit code in our list | ||
114 | user.Authorised = false; | ||
115 | return (user); | ||
116 | } | ||
117 | |||
118 | if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID)) | ||
119 | { | ||
120 | // YAY! Valid login | ||
121 | user.Authorised = true; | ||
122 | user.LoginInfo = new Login(); | ||
123 | user.LoginInfo.Agent = agentID; | ||
124 | user.LoginInfo.Session = sessionID; | ||
125 | user.LoginInfo.SecureSession = validcircuit.SecureSessionID; | ||
126 | user.LoginInfo.First = validcircuit.firstname; | ||
127 | user.LoginInfo.Last = validcircuit.lastname; | ||
128 | } | ||
129 | else | ||
130 | { | ||
131 | // Invalid | ||
132 | user.Authorised = false; | ||
133 | } | ||
134 | |||
135 | return (user); | ||
136 | } | ||
137 | |||
138 | public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) | ||
139 | { | ||
140 | WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString()); | ||
141 | DeleteSession.Method = "DELETE"; | ||
142 | DeleteSession.ContentType = "text/plaintext"; | ||
143 | DeleteSession.ContentLength = 0; | ||
144 | |||
145 | StreamWriter stOut = new StreamWriter(DeleteSession.GetRequestStream(), System.Text.Encoding.ASCII); | ||
146 | stOut.Write(""); | ||
147 | stOut.Close(); | ||
148 | |||
149 | StreamReader stIn = new StreamReader(DeleteSession.GetResponse().GetResponseStream()); | ||
150 | string GridResponse = stIn.ReadToEnd(); | ||
151 | stIn.Close(); | ||
152 | return (true); | ||
153 | } | ||
154 | |||
155 | public override UUIDBlock RequestUUIDBlock() | ||
156 | { | ||
157 | UUIDBlock uuidBlock = new UUIDBlock(); | ||
158 | return (uuidBlock); | ||
159 | } | ||
160 | |||
161 | public override NeighbourInfo[] RequestNeighbours() | ||
162 | { | ||
163 | return null; | ||
164 | } | ||
165 | |||
166 | public override IList RequestMapBlocks(int minX, int minY, int maxX, int maxY) | ||
167 | { | ||
168 | Hashtable param = new Hashtable(); | ||
169 | param["xmin"] = minX; | ||
170 | param["ymin"] = minY; | ||
171 | param["xmax"] = maxX; | ||
172 | param["ymax"] = maxY; | ||
173 | IList parameters = new ArrayList(); | ||
174 | parameters.Add(param); | ||
175 | XmlRpcRequest req = new XmlRpcRequest("map_block", parameters); | ||
176 | XmlRpcResponse resp = req.Send(GridServerUrl, 3000); | ||
177 | Hashtable respData = (Hashtable)resp.Value; | ||
178 | return (IList)respData["sim-profiles"]; | ||
179 | } | ||
180 | |||
181 | public override void SetServerInfo(string ServerUrl, string SendKey, string RecvKey) | ||
182 | { | ||
183 | this.GridServerUrl = ServerUrl; | ||
184 | this.GridSendKey = SendKey; | ||
185 | this.GridRecvKey = RecvKey; | ||
186 | } | ||
187 | |||
188 | public override string GetName() | ||
189 | { | ||
190 | return "Remote"; | ||
191 | } | ||
192 | |||
193 | public override void Close() | ||
194 | { | ||
195 | |||
196 | } | ||
197 | } | ||
198 | |||
199 | public class RemoteGridPlugin : IGridPlugin | ||
200 | { | ||
201 | public RemoteGridPlugin() | ||
202 | { | ||
203 | |||
204 | } | ||
205 | |||
206 | public IGridServer GetGridServer() | ||
207 | { | ||
208 | return (new RemoteGridServer()); | ||
209 | } | ||
210 | } | ||
211 | |||
212 | } | ||