aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-04-25 13:03:48 +0000
committerMW2007-04-25 13:03:48 +0000
commitf7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch)
treeb9f8f1dac346906f1333aa3fc8da704466eda005
parent* Added try{}catch{} to RunTerrainCmd (diff)
downloadopensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip
opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz
opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2
opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz
Small clean up of files and directories
Diffstat
-rw-r--r--OpenGridServices.GridServer/SimProfiles.cs341
-rw-r--r--OpenSim.Framework/AgentInventory.cs2
-rw-r--r--OpenSim.Framework/Interfaces/IAssetServer.cs (renamed from OpenSim.Framework/IAssetServer.cs)2
-rw-r--r--OpenSim.Framework/Interfaces/IConfig.cs (renamed from OpenSim.Framework/IConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGenericConfig.cs (renamed from OpenSim.Framework/IGenericConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGridConfig.cs (renamed from OpenSim.Framework/IGridConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IGridServer.cs (renamed from OpenSim.Framework/IGridServer.cs)5
-rw-r--r--OpenSim.Framework/Interfaces/ILocalStorage.cs (renamed from OpenSim.Framework/ILocalStorage.cs)2
-rw-r--r--OpenSim.Framework/Interfaces/IScriptAPI.cs (renamed from OpenSim.Framework/IScriptAPI.cs)1
-rw-r--r--OpenSim.Framework/Interfaces/IScriptEngine.cs (renamed from OpenSim.Framework/IScriptEngine.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IUserConfig.cs (renamed from OpenSim.Framework/IUserConfig.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/IUserServer.cs (renamed from OpenSim.Framework/IUserServer.cs)0
-rw-r--r--OpenSim.Framework/Interfaces/LocalGridBase.cs (renamed from OpenSim.Framework/LocalGridBase.cs)1
-rw-r--r--OpenSim.Framework/Interfaces/RemoteGridBase.cs (renamed from OpenSim.Framework/RemoteGridBase.cs)21
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj58
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build36
-rw-r--r--OpenSim.Framework/SimProfile.cs4
-rw-r--r--OpenSim.Framework/Types/AgentCiruitData.cs (renamed from OpenSim.Framework/AgentCiruitData.cs)4
-rw-r--r--OpenSim.Framework/Types/AssetBase.cs (renamed from OpenSim.Framework/AssetBase.cs)2
-rw-r--r--OpenSim.Framework/Types/Login.cs (renamed from OpenSim.Framework/Login.cs)2
-rw-r--r--OpenSim.Framework/Types/NeighbourInfo.cs (renamed from OpenSim.Framework/NeighbourInfo.cs)2
-rw-r--r--OpenSim.Framework/Types/OSVector3.cs (renamed from OpenSim.Framework/OSVector3.cs)2
-rw-r--r--OpenSim.Framework/Types/PrimData.cs (renamed from OpenSim.Framework/PrimData.cs)2
-rw-r--r--OpenSim.Framework/UserProfile.cs2
-rw-r--r--OpenSim.Framework/UserProfileManager.cs14
-rw-r--r--OpenSim.Framework/UserProfileManagerBase.cs3
-rw-r--r--OpenSim.GridInterfaces/Local/LocalAssetServer.cs2
-rw-r--r--OpenSim.GridInterfaces/Local/LocalGridServer.cs2
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs2
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteGridServer.cs22
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs2
-rw-r--r--OpenSim.RegionServer/Assets/AssetCache.cs2
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs6
-rw-r--r--OpenSim.RegionServer/ConsoleCmds.cs0
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj15
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build5
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs22
-rw-r--r--OpenSim.RegionServer/SimClient.cs2
-rw-r--r--OpenSim.RegionServer/SimConsole.cs0
-rw-r--r--OpenSim.RegionServer/world/Primitive.cs2
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs2
-rw-r--r--OpenSim.RegionServer/world/ScriptEngine.cs18
-rw-r--r--OpenSim.RegionServer/world/SurfacePatch.cs22
-rw-r--r--OpenSim.RegionServer/world/World.cs6
-rw-r--r--OpenSim.RegionServer/world/WorldPacketHandlers.cs2
-rw-r--r--OpenSim.RegionServer/world/WorldScripting.cs1
-rw-r--r--OpenSim.RegionServer/world/scripting/IScript.cs16
-rw-r--r--OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs1
-rw-r--r--OpenSim.Servers/LocalUserProfileManager.cs1
-rw-r--r--OpenSim.Servers/LoginServer.cs1
-rw-r--r--OpenSim.Servers/OpenGridProtocol.cs183
-rw-r--r--OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs2
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs2
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs2
-rw-r--r--OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs2
-rw-r--r--OpenSim.sln230
56 files changed, 501 insertions, 580 deletions
diff --git a/OpenGridServices.GridServer/SimProfiles.cs b/OpenGridServices.GridServer/SimProfiles.cs
index bd91d5b..ae40133 100644
--- a/OpenGridServices.GridServer/SimProfiles.cs
+++ b/OpenGridServices.GridServer/SimProfiles.cs
@@ -41,88 +41,105 @@ using System.Xml;
41 41
42namespace OpenGridServices.GridServer 42namespace OpenGridServices.GridServer
43{ 43{
44 /// <summary> 44 /// <summary>
45 /// </summary> 45 /// </summary>
46 public class SimProfileManager { 46 public class SimProfileManager
47 47 {
48 public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>(); 48
49 private OpenGrid_Main m_gridManager; 49 public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
50 50 private OpenGrid_Main m_gridManager;
51 public SimProfileManager(OpenGrid_Main gridManager) { 51
52 m_gridManager = gridManager; 52 public SimProfileManager(OpenGrid_Main gridManager)
53 } 53 {
54 54 m_gridManager = gridManager;
55 public void LoadProfiles() { // should abstract this out 55 }
56 IObjectContainer db; 56
57 db = Db4oFactory.OpenFile("simprofiles.yap"); 57 public void LoadProfiles()
58 IObjectSet result = db.Get(typeof(SimProfileBase)); 58 { // should abstract this out
59 foreach (SimProfileBase simprof in result) { 59 IObjectContainer db;
60 SimProfiles.Add(simprof.UUID, simprof); 60 db = Db4oFactory.OpenFile("simprofiles.yap");
61 } 61 IObjectSet result = db.Get(typeof(SimProfileBase));
62 MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database"); 62 foreach (SimProfileBase simprof in result)
63 db.Close(); 63 {
64 } 64 SimProfiles.Add(simprof.UUID, simprof);
65 65 }
66 public SimProfileBase GetProfileByHandle(ulong reqhandle) { 66 MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
67 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { 67 db.Close();
68 if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID]; 68 }
69 } 69
70 return null; 70 public SimProfileBase GetProfileByHandle(ulong reqhandle)
71 } 71 {
72 72 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys)
73 public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) { 73 {
74 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { 74 if (SimProfiles[UUID].regionhandle == reqhandle) return SimProfiles[UUID];
75 if(SimProfiles[UUID].UUID==ProfileLLUUID) return SimProfiles[UUID]; 75 }
76 } 76 return null;
77 return null; 77 }
78 } 78
79 79 public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID)
80 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) { 80 {
81 SimProfileBase TheSim=GetProfileByHandle(regionhandle); 81 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys)
82 if(TheSim != null) 82 {
83 if(TheSim.recvkey==simrecvkey) { 83 if (SimProfiles[UUID].UUID == ProfileLLUUID) return SimProfiles[UUID];
84 return true; 84 }
85 } else { 85 return null;
86 return false; 86 }
87 } else return false; 87
88 88 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey)
89 } 89 {
90 90 SimProfileBase TheSim = GetProfileByHandle(regionhandle);
91 public string GetXMLNeighbours(ulong reqhandle) { 91 if (TheSim != null)
92 string response=""; 92 if (TheSim.recvkey == simrecvkey)
93 SimProfileBase central_region = GetProfileByHandle(reqhandle); 93 {
94 SimProfileBase neighbour; 94 return true;
95 for(int x=-1; x<2; x++) for(int y=-1; y<2; y++) { 95 }
96 if(GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX+x)*256), (uint)(central_region.RegionLocY+y)*256))!=null) { 96 else
97 neighbour=GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX+x)*256), (uint)(central_region.RegionLocY+y)*256)); 97 {
98 response+="<neighbour>"; 98 return false;
99 response+="<sim_ip>" + neighbour.sim_ip + "</sim_ip>"; 99 }
100 response+="<sim_port>" + neighbour.sim_port.ToString() + "</sim_port>"; 100 else return false;
101 response+="<locx>" + neighbour.RegionLocX.ToString() + "</locx>"; 101
102 response+="<locy>" + neighbour.RegionLocY.ToString() + "</locy>"; 102 }
103 response+="<regionhandle>" + neighbour.regionhandle.ToString() + "</regionhandle>"; 103
104 response+="</neighbour>"; 104 public string GetXMLNeighbours(ulong reqhandle)
105 105 {
106 } 106 string response = "";
107 } 107 SimProfileBase central_region = GetProfileByHandle(reqhandle);
108 return response; 108 SimProfileBase neighbour;
109 } 109 for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
110 110 {
111 public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) { 111 if (GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX + x) * 256), (uint)(central_region.RegionLocY + y) * 256)) != null)
112 SimProfileBase newprofile = new SimProfileBase(); 112 {
113 newprofile.regionname=regionname; 113 neighbour = GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX + x) * 256), (uint)(central_region.RegionLocY + y) * 256));
114 newprofile.sim_ip=sim_ip; 114 response += "<neighbour>";
115 newprofile.sim_port=sim_port; 115 response += "<sim_ip>" + neighbour.sim_ip + "</sim_ip>";
116 newprofile.RegionLocX=RegionLocX; 116 response += "<sim_port>" + neighbour.sim_port.ToString() + "</sim_port>";
117 newprofile.RegionLocY=RegionLocY; 117 response += "<locx>" + neighbour.RegionLocX.ToString() + "</locx>";
118 newprofile.caps_url="http://" + sim_ip + ":9000/"; 118 response += "<locy>" + neighbour.RegionLocY.ToString() + "</locy>";
119 newprofile.sendkey=sendkey; 119 response += "<regionhandle>" + neighbour.regionhandle.ToString() + "</regionhandle>";
120 newprofile.recvkey=recvkey; 120 response += "</neighbour>";
121 newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); 121
122 newprofile.UUID=LLUUID.Random(); 122 }
123 this.SimProfiles.Add(newprofile.UUID,newprofile); 123 }
124 return newprofile; 124 return response;
125 } 125 }
126
127 public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey)
128 {
129 SimProfileBase newprofile = new SimProfileBase();
130 newprofile.regionname = regionname;
131 newprofile.sim_ip = sim_ip;
132 newprofile.sim_port = sim_port;
133 newprofile.RegionLocX = RegionLocX;
134 newprofile.RegionLocY = RegionLocY;
135 newprofile.caps_url = "http://" + sim_ip + ":9000/";
136 newprofile.sendkey = sendkey;
137 newprofile.recvkey = recvkey;
138 newprofile.regionhandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
139 newprofile.UUID = LLUUID.Random();
140 this.SimProfiles.Add(newprofile.UUID, newprofile);
141 return newprofile;
142 }
126 143
127 public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request) 144 public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request)
128 { 145 {
@@ -158,15 +175,15 @@ namespace OpenGridServices.GridServer
158 if (GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256)) != null) 175 if (GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256)) != null)
159 { 176 {
160 neighbour = GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256)); 177 neighbour = GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256));
161 178
162 NeighbourBlock = new Hashtable(); 179 NeighbourBlock = new Hashtable();
163 NeighbourBlock["sim_ip"] = neighbour.sim_ip; 180 NeighbourBlock["sim_ip"] = neighbour.sim_ip;
164 NeighbourBlock["sim_port"] = neighbour.sim_port.ToString(); 181 NeighbourBlock["sim_port"] = neighbour.sim_port.ToString();
165 NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString(); 182 NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString();
166 NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString(); 183 NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString();
167 NeighbourBlock["UUID"] = neighbour.UUID.ToString(); 184 NeighbourBlock["UUID"] = neighbour.UUID.ToString();
168 185
169 if(neighbour.UUID!=TheSim.UUID) SimNeighboursData.Add(NeighbourBlock); 186 if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock);
170 } 187 }
171 } 188 }
172 189
@@ -176,9 +193,9 @@ namespace OpenGridServices.GridServer
176 responseData["regionname"] = TheSim.regionname; 193 responseData["regionname"] = TheSim.regionname;
177 responseData["estate_id"] = "1"; 194 responseData["estate_id"] = "1";
178 responseData["neighbours"] = SimNeighboursData; 195 responseData["neighbours"] = SimNeighboursData;
179 196
180 responseData["sim_ip"] = TheSim.sim_ip; 197 responseData["sim_ip"] = TheSim.sim_ip;
181 responseData["sim_port"] = TheSim.sim_port.ToString(); 198 responseData["sim_port"] = TheSim.sim_port.ToString();
182 responseData["asset_url"] = m_gridManager.Cfg.DefaultAssetServer; 199 responseData["asset_url"] = m_gridManager.Cfg.DefaultAssetServer;
183 responseData["asset_sendkey"] = m_gridManager.Cfg.AssetSendKey; 200 responseData["asset_sendkey"] = m_gridManager.Cfg.AssetSendKey;
184 responseData["asset_recvkey"] = m_gridManager.Cfg.AssetRecvKey; 201 responseData["asset_recvkey"] = m_gridManager.Cfg.AssetRecvKey;
@@ -193,97 +210,103 @@ namespace OpenGridServices.GridServer
193 210
194 public string RestSetSimMethod(string request, string path, string param) 211 public string RestSetSimMethod(string request, string path, string param)
195 { 212 {
196 Console.WriteLine("SimProfiles.cs:RestSetSimMethod() - processing request......"); 213 Console.WriteLine("SimProfiles.cs:RestSetSimMethod() - processing request......");
197 SimProfileBase TheSim; 214 SimProfileBase TheSim;
198 TheSim = GetProfileByLLUUID(new LLUUID(param)); 215 TheSim = GetProfileByLLUUID(new LLUUID(param));
199 if ((TheSim) == null) { 216 if ((TheSim) == null)
200 TheSim = new SimProfileBase(); 217 {
201 LLUUID UUID = new LLUUID(param); 218 TheSim = new SimProfileBase();
202 TheSim.UUID=UUID; 219 LLUUID UUID = new LLUUID(param);
203 } 220 TheSim.UUID = UUID;
204 221 }
222
205 XmlDocument doc = new XmlDocument(); 223 XmlDocument doc = new XmlDocument();
206 doc.LoadXml(request); 224 doc.LoadXml(request);
207 XmlNode rootnode=doc.FirstChild; 225 XmlNode rootnode = doc.FirstChild;
208 XmlNode authkeynode = rootnode.ChildNodes[0]; 226 XmlNode authkeynode = rootnode.ChildNodes[0];
209 if (authkeynode.Name != "authkey") 227 if (authkeynode.Name != "authkey")
210 { 228 {
211 return "ERROR! bad XML - expected authkey tag"; 229 return "ERROR! bad XML - expected authkey tag";
212 } 230 }
213 231
214 XmlNode simnode = rootnode.ChildNodes[1]; 232 XmlNode simnode = rootnode.ChildNodes[1];
215 if (simnode.Name != "sim") 233 if (simnode.Name != "sim")
216 { 234 {
217 return "ERROR! bad XML - expected sim tag"; 235 return "ERROR! bad XML - expected sim tag";
218 } 236 }
219 237
220 if (authkeynode.InnerText != m_gridManager.Cfg.SimRecvKey) 238 if (authkeynode.InnerText != m_gridManager.Cfg.SimRecvKey)
239 {
240 return "ERROR! invalid key";
241 }
242 for (int i = 0; i < simnode.ChildNodes.Count; i++)
243 {
244 switch (simnode.ChildNodes[i].Name)
221 { 245 {
222 return "ERROR! invalid key"; 246 case "regionname":
223 } 247 TheSim.regionname = simnode.ChildNodes[i].InnerText;
224 for (int i = 0; i < simnode.ChildNodes.Count; i++) { 248 break;
225 switch (simnode.ChildNodes[i].Name) { 249
226 case "regionname": 250 case "sim_ip":
227 TheSim.regionname = simnode.ChildNodes[i].InnerText; 251 TheSim.sim_ip = simnode.ChildNodes[i].InnerText;
228 break; 252 break;
229 253
230 case "sim_ip": 254 case "sim_port":
231 TheSim.sim_ip = simnode.ChildNodes[i].InnerText; 255 TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
232 break; 256 break;
233 257
234 case "sim_port": 258 case "region_locx":
235 TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText); 259 TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
236 break; 260 TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
237 261 break;
238 case "region_locx": 262
239 TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); 263 case "region_locy":
240 TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
241 break;
242
243 case "region_locy":
244 TheSim.RegionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); 264 TheSim.RegionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
245 TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256)); 265 TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
246 break; 266 break;
247 } 267 }
248 } 268 }
249 269
250 try { 270 try
251 SimProfiles.Add(TheSim.UUID, TheSim); 271 {
252 IObjectContainer db; 272 SimProfiles.Add(TheSim.UUID, TheSim);
253 db = Db4oFactory.OpenFile("simprofiles.yap"); 273 IObjectContainer db;
254 db.Set(TheSim); 274 db = Db4oFactory.OpenFile("simprofiles.yap");
255 db.Close(); 275 db.Set(TheSim);
256 return "OK"; 276 db.Close();
257 } catch(Exception e) { 277 return "OK";
258 return "ERROR! could not save to database!"; 278 }
259 } 279 catch (Exception e)
280 {
281 return "ERROR! could not save to database!";
282 }
260 283
261 } 284 }
262 285
263 public string RestGetRegionMethod(string request, string path, string param ) 286 public string RestGetRegionMethod(string request, string path, string param)
264 { 287 {
265 SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param)); 288 SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
266 return RestGetSimMethod("", "/sims/", param); 289 return RestGetSimMethod("", "/sims/", param);
267 } 290 }
268 291
269 public string RestSetRegionMethod(string request, string path, string param ) 292 public string RestSetRegionMethod(string request, string path, string param)
270 { 293 {
271 SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param)); 294 SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
272 return RestSetSimMethod("", "/sims/", param); 295 return RestSetSimMethod("", "/sims/", param);
273 } 296 }
274 297
275 public string RestGetSimMethod(string request, string path, string param ) 298 public string RestGetSimMethod(string request, string path, string param)
276 { 299 {
277 string respstring = String.Empty; 300 string respstring = String.Empty;
278 301
279 SimProfileBase TheSim; 302 SimProfileBase TheSim;
280 LLUUID UUID = new LLUUID(param); 303 LLUUID UUID = new LLUUID(param);
281 TheSim = GetProfileByLLUUID(UUID); 304 TheSim = GetProfileByLLUUID(UUID);
282 305
283 if (!(TheSim == null)) 306 if (!(TheSim == null))
284 { 307 {
285 respstring = "<Root>"; 308 respstring = "<Root>";
286 respstring += "<authkey>" + m_gridManager.Cfg.SimSendKey + "</authkey>"; 309 respstring += "<authkey>" + m_gridManager.Cfg.SimSendKey + "</authkey>";
287 respstring += "<sim>"; 310 respstring += "<sim>";
288 respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; 311 respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>";
289 respstring += "<regionname>" + TheSim.regionname + "</regionname>"; 312 respstring += "<regionname>" + TheSim.regionname + "</regionname>";
@@ -293,13 +316,13 @@ namespace OpenGridServices.GridServer
293 respstring += "<region_locy>" + TheSim.RegionLocY.ToString() + "</region_locy>"; 316 respstring += "<region_locy>" + TheSim.RegionLocY.ToString() + "</region_locy>";
294 respstring += "<estate_id>1</estate_id>"; 317 respstring += "<estate_id>1</estate_id>";
295 respstring += "</sim>"; 318 respstring += "</sim>";
296 respstring += "</Root>"; 319 respstring += "</Root>";
297 } 320 }
298 321
299 return respstring; 322 return respstring;
300 } 323 }
301 324
302 } 325 }
303 326
304 327
305} 328}
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index f715129..cabefc9 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Framework.Assets; 6using OpenSim.Framework.Types;
7 7
8namespace OpenSim.Framework.Inventory 8namespace OpenSim.Framework.Inventory
9{ 9{
diff --git a/OpenSim.Framework/IAssetServer.cs b/OpenSim.Framework/Interfaces/IAssetServer.cs
index a0de548..3f86acc 100644
--- a/OpenSim.Framework/IAssetServer.cs
+++ b/OpenSim.Framework/Interfaces/IAssetServer.cs
@@ -30,7 +30,7 @@ using System.Net.Sockets;
30using System.IO; 30using System.IO;
31using System.Threading; 31using System.Threading;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Assets; 33using OpenSim.Framework.Types;
34 34
35namespace OpenSim.Framework.Interfaces 35namespace OpenSim.Framework.Interfaces
36{ 36{
diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/IConfig.cs
+++ b/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/IGenericConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/IGridConfig.cs b/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/IGridConfig.cs
+++ b/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/Interfaces/IGridServer.cs
index 9c06a6b..b01f308 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/Interfaces/IGridServer.cs
@@ -27,13 +27,14 @@
27 27
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Net; 32using System.Net;
33using System.Net.Sockets; 33using System.Net.Sockets;
34using System.IO; 34using System.IO;
35using libsecondlife; 35using libsecondlife;
36using OpenSim; 36using OpenSim;
37using OpenSim.Framework.Types;
37 38
38namespace OpenSim.Framework.Interfaces 39namespace OpenSim.Framework.Interfaces
39{ 40{
@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
51 string GetName(); 52 string GetName();
52 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); 53 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
53 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 54 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
54 void Close(); 55 void Close();
55 } 56 }
56 57
57 public struct UUIDBlock 58 public struct UUIDBlock
diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 2c45baa..a4d2ba1 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Assets; 30using OpenSim.Framework.Types;
31 31
32namespace OpenSim.Framework.Interfaces 32namespace OpenSim.Framework.Interfaces
33{ 33{
diff --git a/OpenSim.Framework/IScriptAPI.cs b/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 2f58198..3ad0f06 100644
--- a/OpenSim.Framework/IScriptAPI.cs
+++ b/OpenSim.Framework/Interfaces/IScriptAPI.cs
@@ -1,6 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Types;
4 5
5namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Interfaces
6{ 7{
diff --git a/OpenSim.Framework/IScriptEngine.cs b/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/IScriptEngine.cs
+++ b/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/IUserConfig.cs b/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/IUserConfig.cs
+++ b/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/IUserServer.cs b/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/IUserServer.cs
+++ b/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/Interfaces/LocalGridBase.cs
index 6857d6d..c3ab262 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/Interfaces/LocalGridBase.cs
@@ -2,6 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Types;
5 6
6namespace OpenSim.Framework.Interfaces 7namespace OpenSim.Framework.Interfaces
7{ 8{
diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index 0b72b9f..f24ec66 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
@@ -1,8 +1,9 @@
1using System; 1using System;
2using System.Collections; 2using System.Collections;
3using System.Collections.Generic; 3using System.Collections.Generic;
4using System.Text; 4using System.Text;
5using libsecondlife; 5using libsecondlife;
6using OpenSim.Framework.Types;
6 7
7namespace OpenSim.Framework.Interfaces 8namespace OpenSim.Framework.Interfaces
8{ 9{
@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
22 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); 23 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
23 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 24 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
24 public abstract void Close(); 25 public abstract void Close();
25 public abstract Hashtable GridData { 26 public abstract Hashtable GridData {
26 get; 27 get;
27 set; 28 set;
28 } 29 }
29 30
30 public abstract ArrayList neighbours { 31 public abstract ArrayList neighbours {
31 get; 32 get;
32 set; 33 set;
33 } 34 }
34 } 35 }
35} 36}
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 68b7ef0..ea4817e 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -78,91 +78,91 @@
78 <ItemGroup> 78 <ItemGroup>
79 </ItemGroup> 79 </ItemGroup>
80 <ItemGroup> 80 <ItemGroup>
81 <Compile Include="AgentCiruitData.cs"> 81 <Compile Include="AgentInventory.cs">
82 <SubType>Code</SubType> 82 <SubType>Code</SubType>
83 </Compile> 83 </Compile>
84 <Compile Include="AgentInventory.cs"> 84 <Compile Include="BlockingQueue.cs">
85 <SubType>Code</SubType> 85 <SubType>Code</SubType>
86 </Compile> 86 </Compile>
87 <Compile Include="AssetBase.cs"> 87 <Compile Include="HeightMapGenHills.cs">
88 <SubType>Code</SubType> 88 <SubType>Code</SubType>
89 </Compile> 89 </Compile>
90 <Compile Include="BlockingQueue.cs"> 90 <Compile Include="LoginService.cs">
91 <SubType>Code</SubType> 91 <SubType>Code</SubType>
92 </Compile> 92 </Compile>
93 <Compile Include="HeightMapGenHills.cs"> 93 <Compile Include="SimProfile.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="IAssetServer.cs"> 96 <Compile Include="SimProfileBase.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="IConfig.cs"> 99 <Compile Include="UserProfile.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="IGenericConfig.cs"> 102 <Compile Include="UserProfileManager.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="IGridConfig.cs"> 105 <Compile Include="UserProfileManagerBase.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 <Compile Include="IGridServer.cs"> 108 <Compile Include="Util.cs">
109 <SubType>Code</SubType> 109 <SubType>Code</SubType>
110 </Compile> 110 </Compile>
111 <Compile Include="ILocalStorage.cs"> 111 <Compile Include="Interfaces\IAssetServer.cs">
112 <SubType>Code</SubType> 112 <SubType>Code</SubType>
113 </Compile> 113 </Compile>
114 <Compile Include="IScriptAPI.cs"> 114 <Compile Include="Interfaces\IConfig.cs">
115 <SubType>Code</SubType> 115 <SubType>Code</SubType>
116 </Compile> 116 </Compile>
117 <Compile Include="IScriptEngine.cs"> 117 <Compile Include="Interfaces\IGenericConfig.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="IUserConfig.cs"> 120 <Compile Include="Interfaces\IGridConfig.cs">
121 <SubType>Code</SubType> 121 <SubType>Code</SubType>
122 </Compile> 122 </Compile>
123 <Compile Include="IUserServer.cs"> 123 <Compile Include="Interfaces\IGridServer.cs">
124 <SubType>Code</SubType> 124 <SubType>Code</SubType>
125 </Compile> 125 </Compile>
126 <Compile Include="LocalGridBase.cs"> 126 <Compile Include="Interfaces\ILocalStorage.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="Login.cs"> 129 <Compile Include="Interfaces\IScriptAPI.cs">
130 <SubType>Code</SubType> 130 <SubType>Code</SubType>
131 </Compile> 131 </Compile>
132 <Compile Include="LoginService.cs"> 132 <Compile Include="Interfaces\IScriptEngine.cs">
133 <SubType>Code</SubType> 133 <SubType>Code</SubType>
134 </Compile> 134 </Compile>
135 <Compile Include="NeighbourInfo.cs"> 135 <Compile Include="Interfaces\IUserConfig.cs">
136 <SubType>Code</SubType> 136 <SubType>Code</SubType>
137 </Compile> 137 </Compile>
138 <Compile Include="OSVector3.cs"> 138 <Compile Include="Interfaces\IUserServer.cs">
139 <SubType>Code</SubType> 139 <SubType>Code</SubType>
140 </Compile> 140 </Compile>
141 <Compile Include="PrimData.cs"> 141 <Compile Include="Interfaces\LocalGridBase.cs">
142 <SubType>Code</SubType> 142 <SubType>Code</SubType>
143 </Compile> 143 </Compile>
144 <Compile Include="RemoteGridBase.cs"> 144 <Compile Include="Interfaces\RemoteGridBase.cs">
145 <SubType>Code</SubType> 145 <SubType>Code</SubType>
146 </Compile> 146 </Compile>
147 <Compile Include="SimProfile.cs"> 147 <Compile Include="Properties\AssemblyInfo.cs">
148 <SubType>Code</SubType> 148 <SubType>Code</SubType>
149 </Compile> 149 </Compile>
150 <Compile Include="SimProfileBase.cs"> 150 <Compile Include="Types\AgentCiruitData.cs">
151 <SubType>Code</SubType> 151 <SubType>Code</SubType>
152 </Compile> 152 </Compile>
153 <Compile Include="UserProfile.cs"> 153 <Compile Include="Types\AssetBase.cs">
154 <SubType>Code</SubType> 154 <SubType>Code</SubType>
155 </Compile> 155 </Compile>
156 <Compile Include="UserProfileManager.cs"> 156 <Compile Include="Types\Login.cs">
157 <SubType>Code</SubType> 157 <SubType>Code</SubType>
158 </Compile> 158 </Compile>
159 <Compile Include="UserProfileManagerBase.cs"> 159 <Compile Include="Types\NeighbourInfo.cs">
160 <SubType>Code</SubType> 160 <SubType>Code</SubType>
161 </Compile> 161 </Compile>
162 <Compile Include="Util.cs"> 162 <Compile Include="Types\OSVector3.cs">
163 <SubType>Code</SubType> 163 <SubType>Code</SubType>
164 </Compile> 164 </Compile>
165 <Compile Include="Properties\AssemblyInfo.cs"> 165 <Compile Include="Types\PrimData.cs">
166 <SubType>Code</SubType> 166 <SubType>Code</SubType>
167 </Compile> 167 </Compile>
168 </ItemGroup> 168 </ItemGroup>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index fb7fbd4..8048de5 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,35 +11,35 @@
11 <resources prefix="OpenSim.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentCiruitData.cs" />
15 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
16 <include name="AssetBase.cs" />
17 <include name="BlockingQueue.cs" /> 15 <include name="BlockingQueue.cs" />
18 <include name="HeightMapGenHills.cs" /> 16 <include name="HeightMapGenHills.cs" />
19 <include name="IAssetServer.cs" />
20 <include name="IConfig.cs" />
21 <include name="IGenericConfig.cs" />
22 <include name="IGridConfig.cs" />
23 <include name="IGridServer.cs" />
24 <include name="ILocalStorage.cs" />
25 <include name="IScriptAPI.cs" />
26 <include name="IScriptEngine.cs" />
27 <include name="IUserConfig.cs" />
28 <include name="IUserServer.cs" />
29 <include name="LocalGridBase.cs" />
30 <include name="Login.cs" />
31 <include name="LoginService.cs" /> 17 <include name="LoginService.cs" />
32 <include name="NeighbourInfo.cs" />
33 <include name="OSVector3.cs" />
34 <include name="PrimData.cs" />
35 <include name="RemoteGridBase.cs" />
36 <include name="SimProfile.cs" /> 18 <include name="SimProfile.cs" />
37 <include name="SimProfileBase.cs" /> 19 <include name="SimProfileBase.cs" />
38 <include name="UserProfile.cs" /> 20 <include name="UserProfile.cs" />
39 <include name="UserProfileManager.cs" /> 21 <include name="UserProfileManager.cs" />
40 <include name="UserProfileManagerBase.cs" /> 22 <include name="UserProfileManagerBase.cs" />
41 <include name="Util.cs" /> 23 <include name="Util.cs" />
24 <include name="Interfaces/IAssetServer.cs" />
25 <include name="Interfaces/IConfig.cs" />
26 <include name="Interfaces/IGenericConfig.cs" />
27 <include name="Interfaces/IGridConfig.cs" />
28 <include name="Interfaces/IGridServer.cs" />
29 <include name="Interfaces/ILocalStorage.cs" />
30 <include name="Interfaces/IScriptAPI.cs" />
31 <include name="Interfaces/IScriptEngine.cs" />
32 <include name="Interfaces/IUserConfig.cs" />
33 <include name="Interfaces/IUserServer.cs" />
34 <include name="Interfaces/LocalGridBase.cs" />
35 <include name="Interfaces/RemoteGridBase.cs" />
42 <include name="Properties/AssemblyInfo.cs" /> 36 <include name="Properties/AssemblyInfo.cs" />
37 <include name="Types/AgentCiruitData.cs" />
38 <include name="Types/AssetBase.cs" />
39 <include name="Types/Login.cs" />
40 <include name="Types/NeighbourInfo.cs" />
41 <include name="Types/OSVector3.cs" />
42 <include name="Types/PrimData.cs" />
43 </sources> 43 </sources>
44 <references basedir="${project::get-base-directory()}"> 44 <references basedir="${project::get-base-directory()}">
45 <lib> 45 <lib>
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ad3e028..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
41 } 41 }
42 return this; 42 return this;
43 } 43 }
44 44
45 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey) 45 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
46 { 46 {
47 try 47 try
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
73 } 73 }
74 return this; 74 return this;
75 } 75 }
76 76
77 77
78 public SimProfile() 78 public SimProfile()
79 { 79 {
diff --git a/OpenSim.Framework/AgentCiruitData.cs b/OpenSim.Framework/Types/AgentCiruitData.cs
index e1a79b9..555b3b9 100644
--- a/OpenSim.Framework/AgentCiruitData.cs
+++ b/OpenSim.Framework/Types/AgentCiruitData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Types
7{ 7{
8 public class AgentCircuitData 8 public class AgentCircuitData
9 { 9 {
@@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
11 public LLUUID AgentID; 11 public LLUUID AgentID;
12 public LLUUID SessionID; 12 public LLUUID SessionID;
13 public LLUUID SecureSessionID; 13 public LLUUID SecureSessionID;
14 public LLVector3 startpos; 14 public LLVector3 startpos;
15 public string firstname; 15 public string firstname;
16 public string lastname; 16 public string lastname;
17 public uint circuitcode; 17 public uint circuitcode;
diff --git a/OpenSim.Framework/AssetBase.cs b/OpenSim.Framework/Types/AssetBase.cs
index 8206b30..f6104f8 100644
--- a/OpenSim.Framework/AssetBase.cs
+++ b/OpenSim.Framework/Types/AssetBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Assets 6namespace OpenSim.Framework.Types
7{ 7{
8 public class AssetBase 8 public class AssetBase
9 { 9 {
diff --git a/OpenSim.Framework/Login.cs b/OpenSim.Framework/Types/Login.cs
index 8a67853..ed77a46 100644
--- a/OpenSim.Framework/Login.cs
+++ b/OpenSim.Framework/Types/Login.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Interfaces 6namespace OpenSim.Framework.Types
7{ 7{
8 public class Login 8 public class Login
9 { 9 {
diff --git a/OpenSim.Framework/NeighbourInfo.cs b/OpenSim.Framework/Types/NeighbourInfo.cs
index 8b4fa64..58b6cb1 100644
--- a/OpenSim.Framework/NeighbourInfo.cs
+++ b/OpenSim.Framework/Types/NeighbourInfo.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Interfaces 5namespace OpenSim.Framework.Types
6{ 6{
7 public class NeighbourInfo 7 public class NeighbourInfo
8 { 8 {
diff --git a/OpenSim.Framework/OSVector3.cs b/OpenSim.Framework/Types/OSVector3.cs
index b5d1223..8fb840b 100644
--- a/OpenSim.Framework/OSVector3.cs
+++ b/OpenSim.Framework/Types/OSVector3.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework 5namespace OpenSim.Framework.Types
6{ 6{
7 public class OSVector3 7 public class OSVector3
8 { 8 {
diff --git a/OpenSim.Framework/PrimData.cs b/OpenSim.Framework/Types/PrimData.cs
index ee4188d..9b41a12 100644
--- a/OpenSim.Framework/PrimData.cs
+++ b/OpenSim.Framework/Types/PrimData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Assets 6namespace OpenSim.Framework.Types
7{ 7{
8 public class PrimData 8 public class PrimData
9 { 9 {
diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs
index 04e9fd5..5b7405a 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim.Framework/UserProfile.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
32 Circuits = new Dictionary<LLUUID, uint>(); 32 Circuits = new Dictionary<LLUUID, uint>();
33 Inventory = new AgentInventory(); 33 Inventory = new AgentInventory();
34 homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); 34 homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
35 homepos = new LLVector3(); 35 homepos = new LLVector3();
36 homelookat = new LLVector3(); 36 homelookat = new LLVector3();
37 } 37 }
38 38
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 33f2abd..eb8b7cd 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
106 106
107 LLUUID AgentID = TheUser.UUID; 107 LLUUID AgentID = TheUser.UUID;
108 TheUser.InitSessionData(); 108 TheUser.InitSessionData();
109 109
110 //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method) 110 //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
111 //SimProfile SimInfo = new SimProfile(); 111 //SimProfile SimInfo = new SimProfile();
112 //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); 112 //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
140 140
141 ArrayList AgentInventory = new ArrayList(); 141 ArrayList AgentInventory = new ArrayList();
142 Console.WriteLine("adding inventory to response"); 142 Console.WriteLine("adding inventory to response");
143 Hashtable TempHash; 143 Hashtable TempHash;
144 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) 144 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
145 { 145 {
146 TempHash = new Hashtable(); 146 TempHash = new Hashtable();
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
200 200
201 this.CustomiseResponse(ref responseData, TheUser); 201 this.CustomiseResponse(ref responseData, TheUser);
202 response.Value = responseData; 202 response.Value = responseData;
203 // TheUser.SendDataToSim(SimInfo); 203 // TheUser.SendDataToSim(SimInfo);
204 return response; 204 return response;
205 205
206 } 206 }
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
211 //} 211 //}
212 } 212 }
213 return response; 213 return response;
214 214
215 } 215 }
216 216
217 private static XmlRpcResponse CreateErrorConnectingToGridResponse() 217 private static XmlRpcResponse CreateErrorConnectingToGridResponse()
@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
258 SimParams["firstname"] = theUser.firstname; 258 SimParams["firstname"] = theUser.firstname;
259 SimParams["lastname"] = theUser.lastname; 259 SimParams["lastname"] = theUser.lastname;
260 SimParams["agent_id"] = theUser.UUID.ToString(); 260 SimParams["agent_id"] = theUser.UUID.ToString();
261 SimParams["circuit_code"] = (Int32)circode; 261 SimParams["circuit_code"] = (Int32)circode;
262 SimParams["startpos_x"] = theUser.homepos.X.ToString(); 262 SimParams["startpos_x"] = theUser.homepos.X.ToString();
263 SimParams["startpos_y"] = theUser.homepos.Y.ToString(); 263 SimParams["startpos_y"] = theUser.homepos.Y.ToString();
264 SimParams["startpos_z"] = theUser.homepos.Z.ToString(); 264 SimParams["startpos_z"] = theUser.homepos.Z.ToString();
265 ArrayList SendParams = new ArrayList(); 265 ArrayList SendParams = new ArrayList();
266 SendParams.Add(SimParams); 266 SendParams.Add(SimParams);
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index c9fbf4c..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
103 newprofile.firstname = firstname; 103 newprofile.firstname = firstname;
104 newprofile.lastname = lastname; 104 newprofile.lastname = lastname;
105 newprofile.MD5passwd = MD5passwd; 105 newprofile.MD5passwd = MD5passwd;
106 newprofile.UUID = LLUUID.Random(); newprofile.Inventory.CreateRootFolder(newprofile.UUID, true); 106 newprofile.UUID = LLUUID.Random();
107 newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
107 this.UserProfiles.Add(newprofile.UUID, newprofile); 108 this.UserProfiles.Add(newprofile.UUID, newprofile);
108 return newprofile; 109 return newprofile;
109 } 110 }
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index fc0ba4a..9162bd3 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -4,7 +4,7 @@ using System.Text;
4using System.Threading; 4using System.Threading;
5using System.IO; 5using System.IO;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Assets; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
9using libsecondlife; 9using libsecondlife;
10using Db4objects.Db4o; 10using Db4objects.Db4o;
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index 311179b..f4b8872 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using System.Threading; 29using System.Threading;
30using System.IO; 30using System.IO;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Assets; 32using OpenSim.Framework.Types;
33using libsecondlife; 33using libsecondlife;
34using Db4objects.Db4o; 34using Db4objects.Db4o;
35using Db4objects.Db4o.Query; 35using Db4objects.Db4o.Query;
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 71fca57..d2f8de1 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -7,7 +7,7 @@ using System.Net.Sockets;
7using System.IO; 7using System.IO;
8using libsecondlife; 8using libsecondlife;
9using OpenSim.Framework.Interfaces; 9using OpenSim.Framework.Interfaces;
10using OpenSim.Framework.Assets; 10using OpenSim.Framework.Types;
11using OpenSim.Framework.Utilities; 11using OpenSim.Framework.Utilities;
12 12
13namespace OpenSim.GridInterfaces.Remote 13namespace OpenSim.GridInterfaces.Remote
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7cd68df..a475471 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -34,7 +34,7 @@ using System.IO;
34using libsecondlife; 34using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Assets; 37using OpenSim.Framework.Types;
38 38
39namespace OpenSim.GridInterfaces.Remote 39namespace OpenSim.GridInterfaces.Remote
40{ 40{
@@ -44,28 +44,28 @@ namespace OpenSim.GridInterfaces.Remote
44 private string GridSendKey; 44 private string GridSendKey;
45 private string GridRecvKey; 45 private string GridRecvKey;
46 private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); 46 private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
47 private ArrayList simneighbours = new ArrayList(); 47 private ArrayList simneighbours = new ArrayList();
48 private Hashtable griddatahash; 48 private Hashtable griddatahash;
49 49
50 public override Dictionary<uint, AgentCircuitData> agentcircuits 50 public override Dictionary<uint, AgentCircuitData> agentcircuits
51 { 51 {
52 get { return AgentCircuits; } 52 get { return AgentCircuits; }
53 set { AgentCircuits = value; } 53 set { AgentCircuits = value; }
54 } 54 }
55 55
56 public override ArrayList neighbours 56 public override ArrayList neighbours
57 { 57 {
58 get { return simneighbours; } 58 get { return simneighbours; }
59 set { simneighbours = value; } 59 set { simneighbours = value; }
60 } 60 }
61 61
62 public override Hashtable GridData 62 public override Hashtable GridData
63 { 63 {
64 get { return griddatahash; } 64 get { return griddatahash; }
65 set { griddatahash = value; } 65 set { griddatahash = value; }
66 } 66 }
67 67
68 68
69 public RemoteGridServer() 69 public RemoteGridServer()
70 { 70 {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); 71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
@@ -84,15 +84,15 @@ namespace OpenSim.GridInterfaces.Remote
84 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); 84 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
85 XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); 85 XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
86 Hashtable GridRespData = (Hashtable)GridResp.Value; 86 Hashtable GridRespData = (Hashtable)GridResp.Value;
87 this.griddatahash=GridRespData; 87 this.griddatahash=GridRespData;
88 88
89 if(GridRespData.ContainsKey("error")) { 89 if(GridRespData.ContainsKey("error")) {
90 string errorstring = (string)GridRespData["error"]; 90 string errorstring = (string)GridRespData["error"];
91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); 91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); 92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
93 return false; 93 return false;
94 } 94 }
95 this.neighbours = (ArrayList)GridRespData["neighbours"]; 95 this.neighbours = (ArrayList)GridRespData["neighbours"];
96 Console.WriteLine(simneighbours.Count); 96 Console.WriteLine(simneighbours.Count);
97 return true; 97 return true;
98 } 98 }
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 998a9db..258bda0 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Assets; 4using OpenSim.Assets;
5using OpenSim.Framework.Assets; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Utilities; 6using OpenSim.Framework.Utilities;
7using libsecondlife; 7using libsecondlife;
8using libsecondlife.Packets; 8using libsecondlife.Packets;
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index 573e5fd..e217d78 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -32,7 +32,7 @@ using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim; 33using OpenSim;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Assets; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
37 37
38namespace OpenSim.Assets 38namespace OpenSim.Assets
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index a50bb2b..136ae53 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -32,7 +32,7 @@ using OpenSim;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33//using OpenSim.GridServers; 33//using OpenSim.GridServers;
34using OpenSim.Framework.Inventory; 34using OpenSim.Framework.Inventory;
35using OpenSim.Framework.Assets; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37 37
38namespace OpenSim.Assets 38namespace OpenSim.Assets
@@ -125,7 +125,7 @@ namespace OpenSim.Assets
125 return res; 125 return res;
126 } 126 }
127 127
128 public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset) 128 public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
129 { 129 {
130 LLUUID newItem = null; 130 LLUUID newItem = null;
131 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 131 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -161,7 +161,7 @@ namespace OpenSim.Assets
161 return res; 161 return res;
162 } 162 }
163 163
164 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) 164 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
165 { 165 {
166 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 166 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
167 { 167 {
diff --git a/OpenSim.RegionServer/ConsoleCmds.cs b/OpenSim.RegionServer/ConsoleCmds.cs
deleted file mode 100644
index e69de29..0000000
--- a/OpenSim.RegionServer/ConsoleCmds.cs
+++ /dev/null
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2dcee6a..ae391a9 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -121,9 +121,6 @@
121 <Compile Include="AgentAssetUpload.cs"> 121 <Compile Include="AgentAssetUpload.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="ConsoleCmds.cs">
125 <SubType>Code</SubType>
126 </Compile>
127 <Compile Include="Grid.cs"> 124 <Compile Include="Grid.cs">
128 <SubType>Code</SubType> 125 <SubType>Code</SubType>
129 </Compile> 126 </Compile>
@@ -145,9 +142,6 @@
145 <Compile Include="SimClient.cs"> 142 <Compile Include="SimClient.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="SimConsole.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="VersionInfo.cs"> 145 <Compile Include="VersionInfo.cs">
152 <SubType>Code</SubType> 146 <SubType>Code</SubType>
153 </Compile> 147 </Compile>
@@ -187,12 +181,6 @@
187 <Compile Include="world\Primitive2.cs"> 181 <Compile Include="world\Primitive2.cs">
188 <SubType>Code</SubType> 182 <SubType>Code</SubType>
189 </Compile> 183 </Compile>
190 <Compile Include="world\ScriptEngine.cs">
191 <SubType>Code</SubType>
192 </Compile>
193 <Compile Include="world\SurfacePatch.cs">
194 <SubType>Code</SubType>
195 </Compile>
196 <Compile Include="world\World.cs"> 184 <Compile Include="world\World.cs">
197 <SubType>Code</SubType> 185 <SubType>Code</SubType>
198 </Compile> 186 </Compile>
@@ -202,9 +190,6 @@
202 <Compile Include="world\WorldScripting.cs"> 190 <Compile Include="world\WorldScripting.cs">
203 <SubType>Code</SubType> 191 <SubType>Code</SubType>
204 </Compile> 192 </Compile>
205 <Compile Include="world\scripting\IScript.cs">
206 <SubType>Code</SubType>
207 </Compile>
208 <Compile Include="world\scripting\IScriptContext.cs"> 193 <Compile Include="world\scripting\IScriptContext.cs">
209 <SubType>Code</SubType> 194 <SubType>Code</SubType>
210 </Compile> 195 </Compile>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index ac93c19..abd7776 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -12,7 +12,6 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="ConsoleCmds.cs" />
16 <include name="Grid.cs" /> 15 <include name="Grid.cs" />
17 <include name="OpenSimMain.cs" /> 16 <include name="OpenSimMain.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 17 <include name="OpenSimNetworkHandler.cs" />
@@ -20,7 +19,6 @@
20 <include name="QueItem.cs" /> 19 <include name="QueItem.cs" />
21 <include name="RegionInfo.cs" /> 20 <include name="RegionInfo.cs" />
22 <include name="SimClient.cs" /> 21 <include name="SimClient.cs" />
23 <include name="SimConsole.cs" />
24 <include name="VersionInfo.cs" /> 22 <include name="VersionInfo.cs" />
25 <include name="Assets/AssetCache.cs" /> 23 <include name="Assets/AssetCache.cs" />
26 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
@@ -34,12 +32,9 @@
34 <include name="world/Entity.cs" /> 32 <include name="world/Entity.cs" />
35 <include name="world/Primitive.cs" /> 33 <include name="world/Primitive.cs" />
36 <include name="world/Primitive2.cs" /> 34 <include name="world/Primitive2.cs" />
37 <include name="world/ScriptEngine.cs" />
38 <include name="world/SurfacePatch.cs" />
39 <include name="world/World.cs" /> 35 <include name="world/World.cs" />
40 <include name="world/WorldPacketHandlers.cs" /> 36 <include name="world/WorldPacketHandlers.cs" />
41 <include name="world/WorldScripting.cs" /> 37 <include name="world/WorldScripting.cs" />
42 <include name="world/scripting/IScript.cs" />
43 <include name="world/scripting/IScriptContext.cs" /> 38 <include name="world/scripting/IScriptContext.cs" />
44 <include name="world/scripting/IScriptEntity.cs" /> 39 <include name="world/scripting/IScriptEntity.cs" />
45 <include name="world/scripting/IScriptHandler.cs" /> 40 <include name="world/scripting/IScriptHandler.cs" />
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 151ac51..e3e9b98 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -41,6 +41,7 @@ using libsecondlife.Packets;
41using OpenSim.world; 41using OpenSim.world;
42using OpenSim.Terrain; 42using OpenSim.Terrain;
43using OpenSim.Framework.Interfaces; 43using OpenSim.Framework.Interfaces;
44using OpenSim.Framework.Types;
44using OpenSim.UserServer; 45using OpenSim.UserServer;
45using OpenSim.Assets; 46using OpenSim.Assets;
46using OpenSim.CAPS; 47using OpenSim.CAPS;
@@ -82,7 +83,7 @@ namespace OpenSim
82 public string m_physicsEngine; 83 public string m_physicsEngine;
83 public bool m_sandbox = false; 84 public bool m_sandbox = false;
84 public bool m_loginserver; 85 public bool m_loginserver;
85 public OpenGridProtocolServer OGSServer; 86 public OpenGridProtocolServer OGSServer;
86 public bool user_accounts = false; 87 public bool user_accounts = false;
87 public bool gridLocalAsset = false; 88 public bool gridLocalAsset = false;
88 89
@@ -205,8 +206,8 @@ namespace OpenSim
205 206
206 if (gridServer.GetName() == "Remote") 207 if (gridServer.GetName() == "Remote")
207 { 208 {
208 // should startup the OGS protocol server here 209 // should startup the OGS protocol server here
209 OGSServer = new OpenGridProtocolServer(8500); 210 //OGSServer = new OpenGridProtocolServer(8500);
210 211
211 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 212 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
212 httpServer.AddXmlRPCHandler("expect_user", 213 httpServer.AddXmlRPCHandler("expect_user",
@@ -298,12 +299,13 @@ namespace OpenSim
298 299
299 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); 300 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
300 httpServer.Start(); 301 httpServer.Start();
301 302
302 if(gridServer.GetName() == "Remote") { 303 if (gridServer.GetName() == "Remote")
303 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); 304 {
304 OGSServer.Start(); 305 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
305 } 306 OGSServer.Start();
306 307 }
308
307 MainServerListener(); 309 MainServerListener();
308 310
309 m_heartbeatTimer.Enabled = true; 311 m_heartbeatTimer.Enabled = true;
@@ -523,7 +525,7 @@ namespace OpenSim
523 525
524 case "terrain": 526 case "terrain":
525 string result = ""; 527 string result = "";
526 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result)) 528 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
527 { 529 {
528 m_console.WriteLine(result); 530 m_console.WriteLine(result);
529 } 531 }
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 4b4132e..9a0a6eb 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -36,7 +36,7 @@ using System.IO;
36using System.Threading; 36using System.Threading;
37using System.Timers; 37using System.Timers;
38using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Assets; 39using OpenSim.Framework.Types;
40using OpenSim.Framework.Inventory; 40using OpenSim.Framework.Inventory;
41using OpenSim.Framework.Utilities; 41using OpenSim.Framework.Utilities;
42using OpenSim.world; 42using OpenSim.world;
diff --git a/OpenSim.RegionServer/SimConsole.cs b/OpenSim.RegionServer/SimConsole.cs
deleted file mode 100644
index e69de29..0000000
--- a/OpenSim.RegionServer/SimConsole.cs
+++ /dev/null
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 6fb5d72..6124248 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -6,7 +6,7 @@ using libsecondlife;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager; 8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Assets; 9using OpenSim.Framework.Types;
10 10
11namespace OpenSim.world 11namespace OpenSim.world
12{ 12{
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 616dc25..34e32f8 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -6,7 +6,7 @@ using libsecondlife;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager; 8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Assets; 9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11 11
12namespace OpenSim.world 12namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/ScriptEngine.cs b/OpenSim.RegionServer/world/ScriptEngine.cs
deleted file mode 100644
index f20a08e..0000000
--- a/OpenSim.RegionServer/world/ScriptEngine.cs
+++ /dev/null
@@ -1,18 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world
6{
7 public class ScriptEngine
8 {
9 public ScriptEngine(World env)
10 {
11 }
12
13 public void LoadScript()
14 {
15
16 }
17 }
18}
diff --git a/OpenSim.RegionServer/world/SurfacePatch.cs b/OpenSim.RegionServer/world/SurfacePatch.cs
deleted file mode 100644
index 71e4116..0000000
--- a/OpenSim.RegionServer/world/SurfacePatch.cs
+++ /dev/null
@@ -1,22 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world
6{
7 public class SurfacePatch
8 {
9 public float[] HeightMap;
10
11 public SurfacePatch() {
12 HeightMap = new float[16*16];
13
14 int xinc;
15 int yinc;
16 for(xinc=0; xinc<16; xinc++) for(yinc=0; yinc<16; yinc++) {
17 HeightMap[xinc+(yinc*16)]=100.0f;
18 }
19
20 }
21 }
22}
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index e0f2e6f..69a6494 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -8,11 +8,11 @@ using System.IO;
8using System.Threading; 8using System.Threading;
9using OpenSim.Physics.Manager; 9using OpenSim.Physics.Manager;
10using OpenSim.Framework.Interfaces; 10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Assets; 11using OpenSim.Framework.Types;
12using OpenSim.Framework.Terrain; 12using OpenSim.Framework.Terrain;
13using OpenSim.Framework.Inventory; 13using OpenSim.Framework.Inventory;
14using OpenSim.Assets; 14using OpenSim.Assets;
15using OpenSim.world.scripting; 15//using OpenSim.world.scripting;
16using OpenSim.RegionServer.world.scripting; 16using OpenSim.RegionServer.world.scripting;
17using OpenSim.RegionServer.world.scripting.Scripts; 17using OpenSim.RegionServer.world.scripting.Scripts;
18using OpenSim.Terrain; 18using OpenSim.Terrain;
@@ -25,7 +25,7 @@ namespace OpenSim.world
25 public Dictionary<libsecondlife.LLUUID, Entity> Entities; 25 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
26 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 26 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
27 public Dictionary<libsecondlife.LLUUID, Primitive> Prims; 27 public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
28 public ScriptEngine Scripts; 28 //public ScriptEngine Scripts;
29 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. 29 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
30 public uint _localNumber = 0; 30 public uint _localNumber = 0;
31 private PhysicsScene phyScene; 31 private PhysicsScene phyScene;
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
index 0643a4e..70cbc6b 100644
--- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs
+++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
@@ -5,7 +5,7 @@ using libsecondlife;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Physics.Manager; 6using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Assets; 8using OpenSim.Framework.Types;
9using OpenSim.Framework.Terrain; 9using OpenSim.Framework.Terrain;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11using OpenSim.Assets; 11using OpenSim.Assets;
diff --git a/OpenSim.RegionServer/world/WorldScripting.cs b/OpenSim.RegionServer/world/WorldScripting.cs
index 2f85869..44ef05a 100644
--- a/OpenSim.RegionServer/world/WorldScripting.cs
+++ b/OpenSim.RegionServer/world/WorldScripting.cs
@@ -5,6 +5,7 @@ using System.IO;
5using System.Reflection; 5using System.Reflection;
6using OpenSim.Framework; 6using OpenSim.Framework;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
8using libsecondlife; 9using libsecondlife;
9 10
10namespace OpenSim.world 11namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/scripting/IScript.cs b/OpenSim.RegionServer/world/scripting/IScript.cs
deleted file mode 100644
index 550594d..0000000
--- a/OpenSim.RegionServer/world/scripting/IScript.cs
+++ /dev/null
@@ -1,16 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world.scripting
6{
7 public interface IScriptHost {
8 bool Register(IScript iscript);
9 }
10 public interface IScript
11 {
12 string Name{get;set;}
13 IScriptHost Host{get;set;}
14 void Show();
15 }
16}
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index dc3402e..c66c148 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
@@ -5,6 +5,7 @@ using OpenSim.Scripting.EmbeddedJVM.Types;
5using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes; 5using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework; 7using OpenSim.Framework;
8using OpenSim.Framework.Types;
8 9
9namespace OpenSim.Scripting.EmbeddedJVM 10namespace OpenSim.Scripting.EmbeddedJVM
10{ 11{
diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/OpenSim.Servers/LocalUserProfileManager.cs
index 6166e02..989af22 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/OpenSim.Servers/LocalUserProfileManager.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework.User;
33using OpenSim.Framework.Grid; 33using OpenSim.Framework.Grid;
34using OpenSim.Framework.Inventory; 34using OpenSim.Framework.Inventory;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Types;
36using libsecondlife; 37using libsecondlife;
37 38
38namespace OpenSim.UserServer 39namespace OpenSim.UserServer
diff --git a/OpenSim.Servers/LoginServer.cs b/OpenSim.Servers/LoginServer.cs
index 77f0dd8..c56dbc1 100644
--- a/OpenSim.Servers/LoginServer.cs
+++ b/OpenSim.Servers/LoginServer.cs
@@ -43,6 +43,7 @@ using OpenSim.Framework.Grid;
43using OpenSim.Framework.Inventory; 43using OpenSim.Framework.Inventory;
44using OpenSim.Framework.User; 44using OpenSim.Framework.User;
45using OpenSim.Framework.Utilities; 45using OpenSim.Framework.Utilities;
46using OpenSim.Framework.Types;
46 47
47namespace OpenSim.UserServer 48namespace OpenSim.UserServer
48{ 49{
diff --git a/OpenSim.Servers/OpenGridProtocol.cs b/OpenSim.Servers/OpenGridProtocol.cs
index c3d7d5c..55c47b4 100644
--- a/OpenSim.Servers/OpenGridProtocol.cs
+++ b/OpenSim.Servers/OpenGridProtocol.cs
@@ -1,89 +1,94 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Net; 3using System.Net;
4using System.Net.Sockets; 4using System.Net.Sockets;
5using System.Text; 5using System.Text;
6using System.Text.RegularExpressions; 6using System.Text.RegularExpressions;
7using System.Threading; 7using System.Threading;
8using Nwc.XmlRpc; 8using Nwc.XmlRpc;
9using System.Collections; 9using System.Collections;
10 10
11namespace OpenSim.Servers 11namespace OpenSim.Servers
12{ 12{
13 public class OpenGridProtocolServer 13 public class OpenGridProtocolServer
14 { 14 {
15 15
16 private Thread m_workerThread; 16 private Thread m_workerThread;
17 private Socket m_listenerSocket; 17 private Socket m_listenerSocket;
18 private IPEndPoint m_IPendpoint; 18 private IPEndPoint m_IPendpoint;
19 19
20 private int m_port; 20 private int m_port;
21 private ArrayList m_clients; 21 private ArrayList m_clients;
22 22
23 private class ClientHandler { 23 private class ClientHandler
24 private Thread m_clientThread; 24 {
25 private Socket m_socketHandle; 25 private Thread m_clientThread;
26 26 private Socket m_socketHandle;
27 public ClientHandler(Socket clientSocketHandle) { 27
28 m_socketHandle=clientSocketHandle; 28 public ClientHandler(Socket clientSocketHandle)
29 m_clientThread = new Thread(new ThreadStart(DoWork)); 29 {
30 m_clientThread.IsBackground = true; 30 m_socketHandle = clientSocketHandle;
31 m_clientThread.Start(); 31 m_clientThread = new Thread(new ThreadStart(DoWork));
32 } 32 m_clientThread.IsBackground = true;
33 33 m_clientThread.Start();
34 private void DoWork() { 34 }
35 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client"); 35
36 this.WriteLine("OpenSim 0.1, running OGS protocol 1.0"); 36 private void DoWork()
37 37 {
38 } 38 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
39 39 this.WriteLine("OpenSim 0.1, running OGS protocol 1.0");
40 private void WriteLine(string theline) { 40
41 theline+="\n"; 41 }
42 byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray()); 42
43 m_socketHandle.Send(thelinebuffer,theline.Length,0); 43 private void WriteLine(string theline)
44 } 44 {
45 } 45 theline += "\n";
46 46 byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray());
47 public OpenGridProtocolServer(int port) 47 m_socketHandle.Send(thelinebuffer, theline.Length, 0);
48 { 48 }
49 m_port = port; 49 }
50 } 50
51 51 public OpenGridProtocolServer(int port)
52 public void Start() 52 {
53 { 53 m_port = port;
54 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket"); 54 }
55 55
56 m_clients = new ArrayList(); 56 public void Start()
57 m_workerThread = new Thread(new ThreadStart(StartServerSocket)); 57 {
58 m_workerThread.IsBackground = true; 58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket");
59 m_workerThread.Start(); 59
60 } 60 m_clients = new ArrayList();
61 61 m_workerThread = new Thread(new ThreadStart(StartServerSocket));
62 private void StartServerSocket() 62 m_workerThread.IsBackground = true;
63 { 63 m_workerThread.Start();
64 try 64 }
65 { 65
66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK"); 66 private void StartServerSocket()
67 67 {
68 68 try
69 m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port); 69 {
70 m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); 70 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
71 m_listenerSocket.Bind(m_IPendpoint); 71
72 m_listenerSocket.Listen(4); 72
73 73 m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
74 Socket sockethandle; 74 m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
75 while (true) 75 m_listenerSocket.Bind(m_IPendpoint);
76 { 76 m_listenerSocket.Listen(4);
77 sockethandle = m_listenerSocket.Accept(); 77
78 lock(m_clients.SyncRoot) { 78 Socket sockethandle;
79 m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle)); 79 while (true)
80 } 80 {
81 } 81 sockethandle = m_listenerSocket.Accept();
82 } 82 lock (m_clients.SyncRoot)
83 catch (Exception e) 83 {
84 { 84 m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle));
85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); 85 }
86 } 86 }
87 } 87 }
88 } 88 catch (Exception e)
89} 89 {
90 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
91 }
92 }
93 }
94}
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index 7b6f765..2bcd91c 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
33using System.Data; 33using System.Data;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Assets; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Terrain; 37using OpenSim.Framework.Terrain;
38using BerkeleyDb; 38using BerkeleyDb;
39using Kds.Serialization; 39using Kds.Serialization;
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index da77701..488da58 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -30,7 +30,7 @@ using Db4objects.Db4o;
30using Db4objects.Db4o.Query; 30using Db4objects.Db4o.Query;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Assets; 33using OpenSim.Framework.Types;
34using OpenSim.Framework.Terrain; 34using OpenSim.Framework.Terrain;
35 35
36namespace OpenSim.Storage.LocalStorageDb4o 36namespace OpenSim.Storage.LocalStorageDb4o
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
index 16b6685..ba9e139 100644
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
@@ -5,7 +5,7 @@ using Db4objects.Db4o;
5using Db4objects.Db4o.Query; 5using Db4objects.Db4o.Query;
6using libsecondlife; 6using libsecondlife;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Assets; 8using OpenSim.Framework.Types;
9 9
10namespace OpenSim.Storage.LocalStorageDb4o 10namespace OpenSim.Storage.LocalStorageDb4o
11{ 11{
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8c9a5e1..ff7b146 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -34,7 +34,7 @@ using System.Data;
34using System.Data.SQLite; 34using System.Data.SQLite;
35using libsecondlife; 35using libsecondlife;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Assets; 37using OpenSim.Framework.Types;
38using OpenSim.Framework.Terrain; 38using OpenSim.Framework.Terrain;
39 39
40namespace OpenSim.Storage.LocalStorageSQLite 40namespace OpenSim.Storage.LocalStorageSQLite
diff --git a/OpenSim.sln b/OpenSim.sln
index 58be9fe..aefeb45 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
@@ -43,139 +43,97 @@ EndProject
43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" 43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
44EndProject 44EndProject
45Global 45Global
46 GlobalSection(SolutionConfigurationPlatforms) = preSolution 46 GlobalSection(SolutionConfigurationPlatforms) = preSolution
47 Debug|Any CPU = Debug|Any CPU 47 Debug|Any CPU = Debug|Any CPU
48 Release|Any CPU = Release|Any CPU 48 Release|Any CPU = Release|Any CPU
49 EndGlobalSection 49 EndGlobalSection
50 GlobalSection(ProjectDependencies) = postSolution 50 GlobalSection(ProjectConfigurationPlatforms) = postSolution
51 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) 51 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 52 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 53 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
54 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) 54 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
55 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) 55 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56 ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) 56 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
57 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 57 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
58 ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 58 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
59 ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 59 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60 ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 60 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
61 ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 61 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
62 ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) 62 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
63 ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) 63 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64 ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000}) 64 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
65 ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 65 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
66 ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 66 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
67 ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 67 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68 ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 68 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
69 ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 69 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
70 ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 70 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
71 ({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000}) 71 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72 ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 72 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
73 ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 73 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
74 ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 74 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
75 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) 75 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 76 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
77 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 77 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
78 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 78 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
79 ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) 79 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80 ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 80 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
81 ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 81 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
82 ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 82 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
83 ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 83 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84 ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 84 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
85 ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 85 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
86 ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 86 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
87 ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 87 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88 ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 88 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
89 ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 89 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
90 ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000}) 90 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
91 EndGlobalSection 91 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92 GlobalSection(ProjectConfigurationPlatforms) = postSolution 92 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
93 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 93 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
94 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 94 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
95 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 95 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 96 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
97 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 97 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
98 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 98 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
99 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 99 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 100 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
101 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 101 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
102 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 102 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
103 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 103 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 104 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
105 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 105 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
106 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 106 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
107 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 107 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 108 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
109 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 109 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
110 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 110 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
111 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 111 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 112 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
113 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 113 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
114 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 114 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
115 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 115 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 116 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
117 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 117 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
118 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 118 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
119 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 119 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 120 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
121 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 121 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
122 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 122 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
123 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 123 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
124 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 124 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
125 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 125 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
126 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 126 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
127 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 127 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 128 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
129 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 129 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
130 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 130 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
131 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 131 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
132 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 132 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
133 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 133 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
134 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 134 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
135 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 135 EndGlobalSection
136 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 136 GlobalSection(SolutionProperties) = preSolution
137 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 137 HideSolutionNode = FALSE
138 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 138 EndGlobalSection
139 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
140 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
141 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
143 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
144 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
145 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
147 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
148 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
149 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
151 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
152 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
153 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
155 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
156 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
157 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
159 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
160 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
161 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
162 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
163 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
164 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
165 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
167 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
168 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
169 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
171 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
172 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
173 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
175 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
176 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
177 EndGlobalSection
178 GlobalSection(SolutionProperties) = preSolution
179 HideSolutionNode = FALSE
180 EndGlobalSection
181EndGlobal 139EndGlobal
generated by cgit v1.1 at 2024-12-16 16:47:01 +0000