From 7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 27 Mar 2007 20:45:04 +0000 Subject: * Reverting todays work. It was worth a try. --- .../OpenGridServices.GridServer.csproj | 2 +- .../OpenGridServices.UserServer.csproj | 39 ++- .../OpenSim.Config.SimConfigDb4o.csproj | 6 +- .../OpenSim.Config.SimConfigDb4o.dll.build | 4 +- .../OpenSim.Framework.Console.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.csproj | 2 +- .../Local/OpenSim.GridInterfaces.Local.csproj | 6 +- .../Local/OpenSim.GridInterfaces.Local.dll.build | 4 +- .../Remote/OpenSim.GridInterfaces.Remote.csproj | 6 +- .../Remote/OpenSim.GridInterfaces.Remote.dll.build | 4 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 4 +- .../OpenSim.Physics.BasicPhysicsPlugin.dll.build | 2 +- .../Manager/OpenSim.Physics.Manager.csproj | 10 +- .../Manager/OpenSim.Physics.Manager.dll.build | 3 +- .../OdePlugin/OpenSim.Physics.OdePlugin.csproj | 4 +- .../OdePlugin/OpenSim.Physics.OdePlugin.dll.build | 2 +- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 4 +- .../OpenSim.Physics.PhysXPlugin.dll.build | 2 +- OpenSim.RegionServer/AgentAssetUpload.cs | 17 +- OpenSim.RegionServer/CAPS/AdminWebFront.cs | 11 +- OpenSim.RegionServer/CAPS/SimHttp.cs | 41 ++- OpenSim.RegionServer/OpenSim.RegionServer.csproj | 68 ++--- .../OpenSim.RegionServer.dll.build | 7 +- OpenSim.RegionServer/OpenSimMain.cs | 8 +- OpenSim.RegionServer/SimClient.cs | 99 +++--- .../UserServer/LocalUserProfileManager.cs | 18 +- OpenSim.RegionServer/UserServer/LoginServer.cs | 20 +- OpenSim.RegionServer/world/Avatar.cs | 39 +-- OpenSim.RegionServer/world/Primitive.cs | 27 +- OpenSim.RegionServer/world/World.cs | 33 +- .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- .../OpenSim.Storage.LocalStorageDb4o.dll.build | 4 +- OpenSim.build | 11 +- OpenSim.sln | 146 +++++---- OpenSim/OpenSim.csproj | 10 +- OpenSim/OpenSim.exe.build | 8 +- OpenSim/RegionServer.cs | 10 +- Prebuild/Prebuild.sln | 10 +- Prebuild/src/Core/Targets/NAntTarget.cs | 28 +- Prebuild/src/Prebuild.csproj | 21 +- Servers/BaseHttpServer.cs | 10 - Servers/CapsHttpServer.cs | 332 +++++++++++++++++++++ Servers/OpenSim.Servers.csproj | 4 +- Servers/OpenSim.Servers.dll.build | 2 +- bin/Prebuild.exe | Bin 176128 -> 176128 bytes prebuild.xml | 16 +- 46 files changed, 676 insertions(+), 436 deletions(-) delete mode 100644 Servers/BaseHttpServer.cs create mode 100644 Servers/CapsHttpServer.cs diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index de6813b..856505f 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {01238835-AEF2-4FC4-BE82-0992851EB4A9} + {3378EE78-2D72-4C21-8F9D-680B33AAFFEE} Debug AnyCPU diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 8334e436..1b67165 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -1,12 +1,13 @@ - + Local 8.0.50727 2.0 - {F01B3935-7479-4EA1-8A91-DF554B7A9983} + {36895293-A627-42EC-BA77-6AF6F5A4A7DF} Debug AnyCPU - + + OpenGridServices.UserServer @@ -15,9 +16,11 @@ IE50 false Exe - + + OpenGridServices.UserServer - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,30 +61,31 @@ False False 4 - + + - + System.dll False - + System.Data.dll False - + System.Xml.dll False - + ..\bin\OpenSim.Framework.dll False - + ..\bin\OpenSim.Framework.Console.dll False - + ..\bin\libsecondlife.dll False @@ -103,4 +110,4 @@ - + \ No newline at end of file diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index 2cc54d3..80796ea 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {87E227FC-786C-4051-A75D-7FA75E3ADA1F} + {C83C9D5B-655E-447D-90CA-7C4AB2F814DD} Debug AnyCPU @@ -82,13 +82,13 @@ OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index e576728..3dfa7ce 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build @@ -25,8 +25,8 @@ - - + + diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 2171a45..bd10ce2 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index d38d254..b81afb5 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} Debug AnyCPU diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 43914e0..e504a0a 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {12107D41-F2F9-4D49-835E-89D79D12DA8D} + {21403281-9649-4CE8-869C-E4F2075DEE94} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index 6bf398e..ec65ba8 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build @@ -24,8 +24,8 @@ - - + + diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index 0b59956..fe32cd6 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B} + {BFCBC85D-2071-4294-923C-EC62D841A219} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index dd6db18..2060454 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build @@ -23,8 +23,8 @@ - - + + diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index 79a4126..23985fd 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808} + {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 3497a55..f146733 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build @@ -21,7 +21,7 @@ - + diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 6982715..0055c9c 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} Debug AnyCPU @@ -72,15 +72,9 @@ - - OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False - OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 4b5ee51..47e5534 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -25,8 +25,7 @@ - - + diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 2d39cf6..7e83efd 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {4A7265F1-134B-4895-A33C-E9A3F84C6C08} + {C81B7E61-943D-4190-87C3-CB02BF67A2B3} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index f25361a..8e49f8f 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build @@ -21,7 +21,7 @@ - + diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index 347d9b2..d2039a1 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {70E89693-4AEF-4EA1-8306-D0EBED065AC8} + {E1510E0F-EFCB-4702-BCB6-96A084454B55} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 5ab70bb..8f9e7dc 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build @@ -22,7 +22,7 @@ - + diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs index 9f85598..a482e80 100644 --- a/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim.RegionServer/AgentAssetUpload.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text; -using OpenSim.Assets; using OpenSim.Framework.Assets; using OpenSim.Framework.Utilities; using libsecondlife; @@ -13,14 +12,10 @@ namespace OpenSim { private Dictionary transactions = new Dictionary(); private SimClient ourClient; - private AssetCache m_assetCache; - private InventoryCache m_inventoryCache; - public AgentAssetUpload(SimClient client, AssetCache assetCache, InventoryCache inventoryCache) + public AgentAssetUpload(SimClient client) { this.ourClient = client; - m_assetCache = assetCache; - m_inventoryCache = inventoryCache; } public void AddUpload(LLUUID transactionID, AssetBase asset) @@ -153,8 +148,8 @@ namespace OpenSim //check if we should add it to inventory if (trans.AddToInventory) { - m_assetCache.AddAsset(trans.Asset); - m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); + OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); + OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); } @@ -181,7 +176,7 @@ namespace OpenSim AssetTransaction trans = this.transactions[transactionID]; if (trans.UploadComplete) { - m_assetCache.AddAsset(trans.Asset); + OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); asset = trans.Asset; } } @@ -200,8 +195,8 @@ namespace OpenSim if (trans.UploadComplete) { //already complete so we can add it to the inventory - m_assetCache.AddAsset(trans.Asset); - Console.WriteLine( "ITem created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); + OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); + Console.WriteLine( "ITem created is " +OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); } else { diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs index 03f8692..ea32589 100644 --- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs +++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; -using OpenSim.world; namespace OpenSim.CAPS { @@ -12,11 +11,9 @@ namespace OpenSim.CAPS private string NewAccountForm; private string LoginForm; private string passWord = "Admin"; - private World m_world; - public AdminWebFront(string password, World world) + public AdminWebFront(string password) { - m_world = world; passWord = password; LoadAdminPage(); } @@ -48,11 +45,11 @@ namespace OpenSim.CAPS { responseString = "

Listing connected Clients

"; OpenSim.world.Avatar TempAv; - foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys) + foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) { - if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar") + if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") { - TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID]; + TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID]; responseString += "

"; responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()); responseString += "

"; diff --git a/OpenSim.RegionServer/CAPS/SimHttp.cs b/OpenSim.RegionServer/CAPS/SimHttp.cs index 92bbc6f..a1073f0 100644 --- a/OpenSim.RegionServer/CAPS/SimHttp.cs +++ b/OpenSim.RegionServer/CAPS/SimHttp.cs @@ -39,27 +39,22 @@ using System.Collections.Generic; using libsecondlife; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Servers; namespace OpenSim.CAPS { // Dummy HTTP server, does nothing useful for now - public class SimCAPSHTTPServer : BaseHttpServer + public class SimCAPSHTTPServer { - private Thread m_workerThread; - private HttpListener m_httpListener; - private Dictionary m_restHandlers = new Dictionary(); - private IGridServer m_gridServer; - private int m_port; + public Thread HTTPD; + public HttpListener Listener; + private Dictionary restHandlers = new Dictionary(); - public SimCAPSHTTPServer(IGridServer gridServer, int port) + public SimCAPSHTTPServer() { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server"); - m_workerThread = new Thread(new ThreadStart(StartHTTP)); - m_workerThread.Start(); - m_gridServer = gridServer; - m_port = port; + HTTPD = new Thread(new ThreadStart(StartHTTP)); + HTTPD.Start(); } public void StartHTTP() @@ -67,15 +62,15 @@ namespace OpenSim.CAPS try { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK"); - m_httpListener = new HttpListener(); + Listener = new HttpListener(); - m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); - m_httpListener.Start(); + Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/"); + Listener.Start(); HttpListenerContext context; while (true) { - context = m_httpListener.GetContext(); + context = Listener.GetContext(); ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); } } @@ -87,9 +82,9 @@ namespace OpenSim.CAPS public bool AddRestHandler(string path, IRestHandler handler) { - if (!this.m_restHandlers.ContainsKey(path)) + if (!this.restHandlers.ContainsKey(path)) { - this.m_restHandlers.Add(path, handler); + this.restHandlers.Add(path, handler); return true; } @@ -113,12 +108,12 @@ namespace OpenSim.CAPS agent_data.lastname = (string)requestData["lastname"]; agent_data.AgentID = new LLUUID((string)requestData["agent_id"]); agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); - if (m_gridServer.GetName() == "Remote") + if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote") { - - ((RemoteGridBase)m_gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); + ((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); } return ""; + break; } } catch (Exception e) @@ -140,9 +135,9 @@ namespace OpenSim.CAPS //path[0] should be empty so we are interested in path[1] if (path.Length > 1) { - if ((path[1] != "") && (this.m_restHandlers.ContainsKey(path[1]))) + if ((path[1] != "") && (this.restHandlers.ContainsKey(path[1]))) { - responseString = this.m_restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod); + responseString = this.restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod); } } diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index c08eb48..f376e04 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,12 +1,13 @@ - + Local 8.0.50727 2.0 - {72B438C6-38C5-4620-AC4C-E15BA326FF51} + {4171D545-81F5-4C64-AD29-6D7414C38181} Debug AnyCPU - + + OpenSim.RegionServer @@ -15,9 +16,11 @@ IE50 false Library - + + OpenSim.RegionServer - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,60 +61,58 @@ False False 4 - + + - + System.dll False - + + System.Xml.dll False - + ..\bin\libsecondlife.dll False - + ..\bin\Axiom.MathLib.dll False - + ..\bin\Db4objects.Db4o.dll False - - OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False - OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False - - OpenSim.Servers - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1} + + OpenSim.Framework + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False Code + + Code @@ -142,12 +146,6 @@ Code - - Code - - - Code - Code @@ -195,4 +193,4 @@ - + \ No newline at end of file diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 04e86bc..4e44c4b 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -49,10 +49,9 @@ - - - - + + + diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 91f8008..7425fca 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs @@ -91,7 +91,7 @@ namespace OpenSim OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + OpenSimRoot.Instance.Cfg.RegionName + " at " + OpenSimRoot.Instance.Cfg.RegionLocX.ToString() + "," + OpenSimRoot.Instance.Cfg.RegionLocY.ToString()); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Initialising world"); - OpenSimRoot.Instance.LocalWorld = new World(OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.Cfg.RegionHandle, OpenSimRoot.Instance.LocalWorld, OpenSimRoot.Instance.Cfg.RegionName, OpenSimRoot.Instance.Cfg); + OpenSimRoot.Instance.LocalWorld = new World(); OpenSimRoot.Instance.LocalWorld.LandMap = OpenSimRoot.Instance.Cfg.LoadWorld(); this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); @@ -113,8 +113,8 @@ namespace OpenSim } OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); - OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort); - OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", OpenSimRoot.Instance.LocalWorld)); + OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(); + OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin")); timer1.Enabled = true; timer1.Interval = 100; @@ -172,7 +172,7 @@ namespace OpenSim { // new client UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet; this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); - SimClient newuser = new SimClient(epSender, useCircuit, OpenSimRoot.Instance.LocalWorld, OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.AssetCache, OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Application, OpenSimRoot.Instance.InventoryCache, OpenSimRoot.Instance.Sandbox); + SimClient newuser = new SimClient(epSender, useCircuit); //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser); OpenSimRoot.Instance.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); } diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 698053d..d463c75 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -71,13 +71,6 @@ namespace OpenSim private AgentAssetUpload UploadAssets; private LLUUID newAssetFolder = LLUUID.Zero; private bool debug = false; - private World m_world; - private Dictionary m_clientThreads; - private AssetCache m_assetCache; - private IGridServer m_gridServer; - private OpenSimApplication m_application; - private InventoryCache m_inventoryCache; - private bool m_sandboxMode; private void ack_pack(Packet Pack) { @@ -112,15 +105,15 @@ namespace OpenSim switch (Pack.Type) { case PacketType.CompleteAgentMovement: - ClientAvatar.CompleteMovement(m_world); + ClientAvatar.CompleteMovement(OpenSimRoot.Instance.LocalWorld); ClientAvatar.SendInitialPosition(); break; case PacketType.RegionHandshakeReply: - m_world.SendLayerData(this); + OpenSimRoot.Instance.LocalWorld.SendLayerData(this); break; case PacketType.AgentWearablesRequest: ClientAvatar.SendInitialAppearance(); - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { if (client.AgentID != this.AgentID) { @@ -129,7 +122,7 @@ namespace OpenSim client.ClientAvatar.SendAppearanceToOtherAgent(this); } } - m_world.GetInitialPrims(this); + OpenSimRoot.Instance.LocalWorld.GetInitialPrims(this); break; case PacketType.AgentIsNowWearing: AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; @@ -141,7 +134,7 @@ namespace OpenSim this.ClientAvatar.SetAppearance(appear); break; case PacketType.ObjectAdd: - m_world.AddNewPrim((ObjectAddPacket)Pack, this); + OpenSimRoot.Instance.LocalWorld.AddNewPrim((ObjectAddPacket)Pack, this); break; case PacketType.ObjectLink: OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); @@ -153,7 +146,7 @@ namespace OpenSim ObjectShapePacket shape = (ObjectShapePacket)Pack; for (int i = 0; i < shape.ObjectData.Length; i++) { - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == shape.ObjectData[i].ObjectLocalID) { @@ -170,7 +163,7 @@ namespace OpenSim if (multipleupdate.ObjectData[i].Type == 9) //change position { libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -184,7 +177,7 @@ namespace OpenSim else if (multipleupdate.ObjectData[i].Type == 10)//rotation { libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -197,7 +190,7 @@ namespace OpenSim { libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -211,13 +204,13 @@ namespace OpenSim RequestImagePacket imageRequest = (RequestImagePacket)Pack; for (int i = 0; i < imageRequest.RequestImage.Length; i++) { - m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image); + OpenSimRoot.Instance.AssetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image); } break; case PacketType.TransferRequest: //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); TransferRequestPacket transfer = (TransferRequestPacket)Pack; - m_assetCache.AddAssetRequest(this, transfer); + OpenSimRoot.Instance.AssetCache.AddAssetRequest(this, transfer); break; case PacketType.AgentUpdate: ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack); @@ -237,18 +230,18 @@ namespace OpenSim kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); kill.ObjectData[0].ID = this.ClientAvatar.localid; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(kill); } - m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode); - lock (m_world.Entities) + OpenSimRoot.Instance.GridServers.GridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode); + lock (OpenSimRoot.Instance.LocalWorld.Entities) { - m_world.Entities.Remove(this.AgentID); + OpenSimRoot.Instance.LocalWorld.Entities.Remove(this.AgentID); } //need to do other cleaning up here too - m_clientThreads.Remove(this.CircuitCode); //this.userEP); - m_application.RemoveClientCircuit(this.CircuitCode); + OpenSimRoot.Instance.ClientThreads.Remove(this.CircuitCode); //this.userEP); + OpenSimRoot.Instance.Application.RemoveClientCircuit(this.CircuitCode); this.ClientThread.Abort(); break; case PacketType.ChatFromViewer: @@ -265,7 +258,7 @@ namespace OpenSim reply.ChatData.FromName = _enc.GetBytes(this.ClientAvatar.firstname + " " + this.ClientAvatar.lastname + "\0"); reply.ChatData.OwnerID = this.AgentID; reply.ChatData.SourceID = this.AgentID; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(reply); } @@ -274,7 +267,7 @@ namespace OpenSim ObjectImagePacket imagePack = (ObjectImagePacket)Pack; for (int i = 0; i < imagePack.ObjectData.Length; i++) { - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == imagePack.ObjectData[i].ObjectLocalID) { @@ -285,7 +278,7 @@ namespace OpenSim break; case PacketType.ObjectFlagUpdate: ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == flags.AgentData.ObjectLocalID) { @@ -313,7 +306,7 @@ namespace OpenSim break; case PacketType.CreateInventoryFolder: CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; - m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); + OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); Console.WriteLine(Pack.ToString()); break; case PacketType.CreateInventoryItem: @@ -327,11 +320,11 @@ namespace OpenSim case PacketType.FetchInventory: //Console.WriteLine("fetch item packet"); FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; - m_inventoryCache.FetchInventory(this, FetchInventory); + OpenSimRoot.Instance.InventoryCache.FetchInventory(this, FetchInventory); break; case PacketType.FetchInventoryDescendents: FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; - m_inventoryCache.FetchInventoryDescendents(this, Fetch); + OpenSimRoot.Instance.InventoryCache.FetchInventoryDescendents(this, Fetch); break; case PacketType.UpdateInventoryItem: UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; @@ -339,17 +332,17 @@ namespace OpenSim { if (update.InventoryData[i].TransactionID != LLUUID.Zero) { - AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); + AssetBase asset = OpenSimRoot.Instance.AssetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); if (asset != null) { - m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); + OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); } else { asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); if (asset != null) { - m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); + OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); } } } @@ -357,7 +350,7 @@ namespace OpenSim break; case PacketType.ViewerEffect: ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { if (client.AgentID != this.AgentID) { @@ -369,7 +362,7 @@ namespace OpenSim break; case PacketType.DeRezObject: //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet"); - m_world.DeRezObject((DeRezObjectPacket)Pack, this); + OpenSimRoot.Instance.LocalWorld.DeRezObject((DeRezObjectPacket)Pack, this); break; } } @@ -508,11 +501,11 @@ namespace OpenSim if (Pack.Header.Zerocoded) { int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer); - m_application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP); + OpenSimRoot.Instance.Application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP); } else { - m_application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP); + OpenSimRoot.Instance.Application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP); } } catch (Exception) @@ -576,22 +569,14 @@ namespace OpenSim this.PacketQueue.Enqueue(item); } - public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimApplication application, InventoryCache inventoryCache, bool sandboxMode) + public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack) { - m_world = world; - m_clientThreads = clientThreads; - m_assetCache = assetCache; - m_gridServer = gridServer; - m_application = application; - m_inventoryCache = inventoryCache; - m_sandboxMode = sandboxMode; - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request"); cirpack = initialcirpack; userEP = remoteEP; PacketQueue = new BlockingQueue(); - this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache ); + this.UploadAssets = new AgentAssetUpload(this); AckTimer = new System.Timers.Timer(500); AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); AckTimer.Start(); @@ -623,16 +608,14 @@ namespace OpenSim protected virtual void InitNewClient() { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); - - m_world.AddViewerAgent(this); - world.Entity tempent = m_world.Entities[this.AgentID]; - + OpenSimRoot.Instance.LocalWorld.AddViewerAgent(this); + world.Entity tempent = OpenSimRoot.Instance.LocalWorld.Entities[this.AgentID]; this.ClientAvatar = (world.Avatar)tempent; } protected virtual void AuthUser() { - AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); + AuthenticateResponse sessionInfo = OpenSimRoot.Instance.GridServers.GridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); if (!sessionInfo.Authorised) { //session/circuit not authorised @@ -655,23 +638,23 @@ namespace OpenSim } // Create Inventory, currently only works for sandbox mode - if (m_sandboxMode) + if (OpenSimRoot.Instance.Sandbox) { if (sessionInfo.LoginInfo.InventoryFolder != null) { this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder); if (sessionInfo.LoginInfo.BaseFolder != null) { - m_inventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder); + OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder); this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder; - AssetBase[] inventorySet = m_assetCache.CreateNewInventorySet(this.AgentID); + AssetBase[] inventorySet = OpenSimRoot.Instance.AssetCache.CreateNewInventorySet(this.AgentID); if (inventorySet != null) { for (int i = 0; i < inventorySet.Length; i++) { if (inventorySet[i] != null) { - m_inventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]); + OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]); } } } @@ -687,8 +670,8 @@ namespace OpenSim { AgentInventory inventory = new AgentInventory(); inventory.AgentID = this.AgentID; - m_inventoryCache.AddNewAgentsInventory(inventory); - m_inventoryCache.CreateNewInventoryFolder(this, baseFolder); + OpenSimRoot.Instance.InventoryCache.AddNewAgentsInventory(inventory); + OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, baseFolder); } } } diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs index eee1c3a..83e340b 100644 --- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs +++ b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs @@ -12,15 +12,11 @@ namespace OpenSim.UserServer { class LocalUserProfileManager : UserProfileManager { - private IGridServer m_gridServer; - private int m_port; - private string m_ipAddr; + private IGridServer _gridServer; - public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr) + public LocalUserProfileManager(IGridServer gridServer) { - m_gridServer = gridServer; - m_port = simPort; - m_ipAddr = ipAddr; + _gridServer = gridServer; } public override void InitUserProfiles() @@ -33,8 +29,8 @@ namespace OpenSim.UserServer uint circode = (uint)response["circuit_code"]; theUser.AddSimCircuit(circode, LLUUID.Random()); response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}"; - response["sim_port"] = m_port; - response["sim_ip"] = m_ipAddr; + response["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort; + response["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr; response["region_y"] = (Int32)996 * 256; response["region_x"] = (Int32)997* 256; @@ -71,9 +67,9 @@ namespace OpenSim.UserServer _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); //working on local computer if so lets add to the gridserver's list of sessions? - if (m_gridServer.GetName() == "Local") + if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local") { - ((LocalGridBase)this.m_gridServer).AddNewSession(_login); + ((LocalGridBase)this._gridServer).AddNewSession(_login); } } } diff --git a/OpenSim.RegionServer/UserServer/LoginServer.cs b/OpenSim.RegionServer/UserServer/LoginServer.cs index 47af8a8..86b098a 100644 --- a/OpenSim.RegionServer/UserServer/LoginServer.cs +++ b/OpenSim.RegionServer/UserServer/LoginServer.cs @@ -52,7 +52,7 @@ namespace OpenSim.UserServer /// public class LoginServer : LoginService , IUserServer { - private IGridServer m_gridServer; + private IGridServer _gridServer; private ushort _loginPort = 8080; public IPAddress clientAddress = IPAddress.Loopback; public IPAddress remoteAddress = IPAddress.Any; @@ -63,14 +63,10 @@ namespace OpenSim.UserServer private string _mpasswd; private bool _needPasswd = false; private LocalUserProfileManager userManager; - private int m_simPort; - private string m_simAddr; - public LoginServer(IGridServer gridServer, string simAddr, int simPort) + public LoginServer(IGridServer gridServer) { - m_gridServer = gridServer; - m_simPort = simPort; - m_simAddr = simAddr; + _gridServer = gridServer; } // InitializeLogin: initialize the login @@ -93,7 +89,7 @@ namespace OpenSim.UserServer SR.Close(); this._mpasswd = EncodePassword("testpass"); - userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr ); + userManager = new LocalUserProfileManager(this._gridServer); userManager.InitUserProfiles(); userManager.SetKeys("", "", "", "Welcome to OpenSim"); @@ -293,8 +289,8 @@ namespace OpenSim.UserServer XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse); Hashtable responseData = (Hashtable)response.Value; - responseData["sim_port"] = m_simPort; - responseData["sim_ip"] = m_simAddr; + responseData["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort; + responseData["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr; responseData["agent_id"] = Agent.ToStringHyphenated(); responseData["session_id"] = Session.ToStringHyphenated(); responseData["secure_session_id"]= secureSess.ToStringHyphenated(); @@ -331,9 +327,9 @@ namespace OpenSim.UserServer _login.InventoryFolder = InventoryFolderID; //working on local computer if so lets add to the gridserver's list of sessions? - if (m_gridServer.GetName() == "Local") + if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local") { - ((LocalGridBase)m_gridServer).AddNewSession(_login); + ((LocalGridBase)this._gridServer).AddNewSession(_login); } // forward the XML-RPC response to the client diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs index 2ae9992..75f2cff 100644 --- a/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim.RegionServer/world/Avatar.cs @@ -30,23 +30,14 @@ namespace OpenSim.world private byte[] visualParams; private AvatarWearable[] Wearables; private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); - private World m_world; - private ulong m_regionHandle; - private Dictionary m_clientThreads; - private string m_regionName; - public Avatar(SimClient TheClient, World world, string regionName, Dictionary clientThreads, ulong regionHandle) + public Avatar(SimClient TheClient) { - m_world = world; - m_clientThreads = clientThreads; - m_regionName = regionName; - m_regionHandle = regionHandle; - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)"); ControllingClient = TheClient; - localid = 8880000 + (m_world._localNumber++); + localid = 8880000 + (OpenSimRoot.Instance.LocalWorld._localNumber++); position = new LLVector3(100.0f, 100.0f, 30.0f); - position.Z = m_world.LandMap[(int)position.Y * 256 + (int)position.X] + 1; + position.Z = OpenSimRoot.Instance.LocalWorld.LandMap[(int)position.Y * 256 + (int)position.X] + 1; visualParams = new byte[218]; for (int i = 0; i < 218; i++) { @@ -61,7 +52,7 @@ namespace OpenSim.world this.Wearables[0].ItemID = LLUUID.Random(); this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); - + } public PhysicsActor PhysActor @@ -105,11 +96,11 @@ namespace OpenSim.world //use CreateTerseBlock() ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = m_regionHandle; // FIXME + terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = terseBlock; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(terse); } @@ -128,11 +119,11 @@ namespace OpenSim.world //It has been a while since last update was sent so lets send one. ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = m_regionHandle; // FIXME + terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = terseBlock; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(terse); } @@ -181,7 +172,7 @@ namespace OpenSim.world AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); mov.AgentData.SessionID = this.ControllingClient.SessionID; mov.AgentData.AgentID = this.ControllingClient.AgentID; - mov.Data.RegionHandle = m_regionHandle; + mov.Data.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // TODO - dynamicalise this stuff mov.Data.Timestamp = 1172750370; mov.Data.Position = new LLVector3(100f, 100f, 23f); @@ -196,7 +187,7 @@ namespace OpenSim.world System.Text.Encoding _enc = System.Text.Encoding.ASCII; //send a objectupdate packet with information about the clients avatar ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); - objupdate.RegionData.RegionHandle = m_regionHandle; + objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -211,9 +202,9 @@ namespace OpenSim.world byte[] pb = pos2.GetBytes(); Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); - m_world._localNumber++; + OpenSimRoot.Instance.LocalWorld._localNumber++; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(objupdate); if (client.AgentID != ControllingClient.AgentID) @@ -250,7 +241,7 @@ namespace OpenSim.world System.Text.Encoding _enc = System.Text.Encoding.ASCII; //send a objectupdate packet with information about the clients avatar ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); - objupdate.RegionData.RegionHandle = m_regionHandle; + objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -302,7 +293,7 @@ namespace OpenSim.world this.visualParams[i] = appear.VisualParam[i].ParamValue; } - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { if (client.AgentID != ControllingClient.AgentID) { @@ -499,7 +490,7 @@ namespace OpenSim.world handshake.RegionInfo.SimAccess = 13; handshake.RegionInfo.WaterHeight = 20; handshake.RegionInfo.RegionFlags = 72458694; - handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); + handshake.RegionInfo.SimName = _enc.GetBytes(OpenSimRoot.Instance.Cfg.RegionName + "\0"); handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); handshake.RegionInfo.TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs index a185f0b..6ff66a3 100644 --- a/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim.RegionServer/world/Primitive.cs @@ -22,9 +22,6 @@ namespace OpenSim.world private PhysicsActor _physActor; private bool physicsEnabled = false; private bool physicstest = false; //just added for testing - private Dictionary m_clientThreads; - private ulong m_regionHandle; - private World m_world; public bool PhysicsEnabled { @@ -68,14 +65,10 @@ namespace OpenSim.world } } - public Primitive(Dictionary clientThreads, ulong regionHandle, World world) + public Primitive() { mesh_cutbegin = 0.0f; mesh_cutend = 1.0f; - - m_clientThreads = clientThreads; - m_regionHandle = regionHandle; - m_world = world; } public override Mesh getMesh() @@ -106,7 +99,7 @@ namespace OpenSim.world { if (this.newPrimFlag) { - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(OurPacket); } @@ -115,11 +108,11 @@ namespace OpenSim.world else if (this.updateFlag) { ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = m_regionHandle; // FIXME + terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = this.CreateImprovedBlock(); - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(terse); } @@ -127,7 +120,7 @@ namespace OpenSim.world } else if (this.dirtyFlag) { - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { UpdateClient(client); } @@ -138,11 +131,11 @@ namespace OpenSim.world if (this._physActor != null && this.physicsEnabled) { ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = m_regionHandle; // FIXME + terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = this.CreateImprovedBlock(); - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(terse); } @@ -262,7 +255,7 @@ namespace OpenSim.world public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) { ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); - objupdate.RegionData.RegionHandle = m_regionHandle; + objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -330,7 +323,7 @@ namespace OpenSim.world { //need to clean this up as it shares a lot of code with CreateFromPacket() ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); - objupdate.RegionData.RegionHandle = m_regionHandle; + objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -487,7 +480,7 @@ namespace OpenSim.world this.primData.LocalID = this.localid; this.primData.Position = this.position; this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w); - m_world.localStorage.StorePrim(this.primData); + OpenSimRoot.Instance.LocalWorld.localStorage.StorePrim(this.primData); } } diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 7605f9e..e6d8921 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs @@ -25,21 +25,10 @@ namespace OpenSim.world private Random Rand = new Random(); private uint _primCount = 702000; private int storageCount; - private Dictionary m_clientThreads; - private ulong m_regionHandle; - private World m_world; - private string m_regionName; - private SimConfig m_cfg; - public World(Dictionary clientThreads, ulong regionHandle, World world, string regionName, SimConfig cfg) + public World() { - m_clientThreads = clientThreads; - m_regionHandle = regionHandle; - m_world = world; - m_regionName = regionName; - m_cfg = cfg; - - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); Entities = new Dictionary(); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); @@ -126,9 +115,9 @@ namespace OpenSim.world HeightmapGenHills hills = new HeightmapGenHills(); this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false); this.phyScene.SetTerrain(this.LandMap); - m_cfg.SaveMap(this.LandMap); + OpenSimRoot.Instance.Cfg.SaveMap(this.LandMap); - foreach(SimClient client in m_clientThreads.Values) { + foreach(SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { this.SendLayerData(client); } } @@ -145,7 +134,7 @@ namespace OpenSim.world _primCount = prim.LocalID + 1; } OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage"); - Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, m_world); + Primitive nPrim = new Primitive(); nPrim.CreateFromStorage(prim); this.Entities.Add(nPrim.uuid, nPrim); } @@ -186,7 +175,7 @@ namespace OpenSim.world public void AddViewerAgent(SimClient AgentClient) { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); - Avatar NewAvatar = new Avatar(AgentClient, m_world, m_regionName, m_clientThreads, m_regionHandle ); + Avatar NewAvatar = new Avatar(AgentClient); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); NewAvatar.SendRegionHandshake(this); @@ -198,7 +187,7 @@ namespace OpenSim.world public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient) { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim"); - Primitive prim = new Primitive(m_clientThreads, m_regionHandle, m_world ); + Primitive prim = new Primitive(); prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z); PhysicsVector pSize = new PhysicsVector( 0.255f, 0.255f, 0.255f); @@ -221,7 +210,7 @@ namespace OpenSim.world foreach( DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData ) { //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); - foreach (Entity ent in m_world.Entities.Values) + foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) { if (ent.localid == Data.ObjectLocalID) { @@ -231,7 +220,7 @@ namespace OpenSim.world kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); kill.ObjectData[0].ID = ent.localid; - foreach (SimClient client in m_clientThreads.Values) + foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { client.OutPacket(kill); } @@ -245,9 +234,9 @@ namespace OpenSim.world } foreach( libsecondlife.LLUUID uuid in DeRezEnts ) { - lock (m_world.Entities) + lock (OpenSimRoot.Instance.LocalWorld.Entities) { - m_world.Entities.Remove(uuid); + OpenSimRoot.Instance.LocalWorld.Entities.Remove(uuid); } } diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 035931e..1f2eb24 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {FC8E9647-4292-49BC-810F-EAEEBF82396B} + {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 550eaa5..44e8597 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -24,8 +24,8 @@ - - + + diff --git a/OpenSim.build b/OpenSim.build index b012a1b..c61b728 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -46,7 +46,7 @@ - + @@ -56,18 +56,16 @@ - - + - @@ -90,7 +88,7 @@ - + @@ -100,11 +98,10 @@ - - + diff --git a/OpenSim.sln b/OpenSim.sln index 39c63f6..8370bef 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,34 +1,32 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E1510E0F-EFCB-4702-BCB6-96A084454B55}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{7AED7536-7D6B-4E28-8016-B5A554C663B4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{87E227FC-786C-4051-A75D-7FA75E3ADA1F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{F01B3935-7479-4EA1-8A91-DF554B7A9983}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{36895293-A627-42EC-BA77-6AF6F5A4A7DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{BFCBC85D-2071-4294-923C-EC62D841A219}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{FC8E9647-4292-49BC-810F-EAEEBF82396B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{E1171263-9131-454C-B0A6-2374D98714A8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{01238835-AEF2-4FC4-BE82-0992851EB4A9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{4A7265F1-134B-4895-A33C-E9A3F84C6C08}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{C81B7E61-943D-4190-87C3-CB02BF67A2B3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{974744D2-C043-42F8-BEE0-DABFD4A294E9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{4171D545-81F5-4C64-AD29-6D7414C38181}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{72B438C6-38C5-4620-AC4C-E15BA326FF51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{21403281-9649-4CE8-869C-E4F2075DEE94}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{12107D41-F2F9-4D49-835E-89D79D12DA8D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{70E89693-4AEF-4EA1-8306-D0EBED065AC8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -36,66 +34,62 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU - {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.Build.0 = Release|Any CPU - {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.Build.0 = Release|Any CPU - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.Build.0 = Release|Any CPU - {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.Build.0 = Release|Any CPU - {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.Build.0 = Release|Any CPU + {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.Build.0 = Release|Any CPU + {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.Build.0 = Release|Any CPU + {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.Build.0 = Release|Any CPU + {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.Build.0 = Release|Any CPU + {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.Build.0 = Release|Any CPU + {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.Build.0 = Release|Any CPU + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.Build.0 = Release|Any CPU + {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.Build.0 = Release|Any CPU + {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.Build.0 = Release|Any CPU + {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.Build.0 = Release|Any CPU + {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.Build.0 = Release|Any CPU + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.Build.0 = Release|Any CPU + {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.Build.0 = Release|Any CPU + {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index 0598f83..bf57515 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {974744D2-C043-42F8-BEE0-DABFD4A294E9} + {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {E1171263-9131-454C-B0A6-2374D98714A8} + {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {7AED7536-7D6B-4E28-8016-B5A554C663B4} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} + {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.RegionServer - {72B438C6-38C5-4620-AC4C-E15BA326FF51} + {4171D545-81F5-4C64-AD29-6D7414C38181} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index 613f527..7d69d90 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build @@ -23,10 +23,10 @@ - - - - + + + + diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs index a0037b1..3612d49 100644 --- a/OpenSim/RegionServer.cs +++ b/OpenSim/RegionServer.cs @@ -7,7 +7,7 @@ using OpenSim.Framework.Console; namespace OpenSim { public class RegionServer : OpenSimMain - { + { [STAThread] public static void Main(string[] args) { @@ -63,14 +63,14 @@ namespace OpenSim OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode"); } - OpenSimRoot.Instance.StartUp(); - if (sim.loginserver && sim.sandbox) { - LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort); + LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); loginServer.Startup(); } - + + OpenSimRoot.Instance.StartUp(); + while (true) { OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 0f35f18..5505224 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU + {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index 0f0deb2..bd366dc 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs @@ -77,16 +77,16 @@ namespace Prebuild.Core.Targets return tmpPath; } - private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr) + private static string BuildReference(SolutionNode solution, ReferenceNode refr) { string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; - - string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); - - return finalPath; + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + string fileRef = FindFileReference(refr.Name, project); + string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/'); + ret += finalPath; + return ret; } else { @@ -126,11 +126,12 @@ namespace Prebuild.Core.Targets string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; - string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/'); - - return finalPath; - } + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + string fileRef = FindFileReference(refr.Name, project); + string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/'); + ret += finalPath; + return ret; + } else { ProjectNode project = (ProjectNode)refr.Parent; @@ -225,7 +226,7 @@ namespace Prebuild.Core.Targets { if (refr.LocalCopy) { - ss.WriteLine(" ", '/')); + ss.WriteLine(" ", '/')); } } ss.WriteLine(" "); @@ -315,8 +316,7 @@ namespace Prebuild.Core.Targets ss.WriteLine(" "); foreach(ReferenceNode refr in project.References) { - string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/'); - ss.WriteLine(" " ); + ss.WriteLine(" ", '/')); } ss.WriteLine(" "); diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 3727947..eddfe74 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -1,9 +1,9 @@ - + Local 8.0.50727 2.0 - {6A56621D-A328-4E23-96E3-0514A3817BAF} + {912F8E52-C5A0-4912-A702-D6DC3F1B4B54} Debug AnyCPU App.ico @@ -17,8 +17,7 @@ IE50 false Exe - - + Prebuild Prebuild.Prebuild @@ -31,8 +30,7 @@ DEBUG;TRACE - - + True 4096 False @@ -50,8 +48,7 @@ TRACE - - + False 4096 True @@ -63,15 +60,15 @@ 1595 - + System.EnterpriseServices.dll False - + System.Xml.dll False - + System.dll False @@ -205,4 +202,4 @@ - \ No newline at end of file + diff --git a/Servers/BaseHttpServer.cs b/Servers/BaseHttpServer.cs deleted file mode 100644 index 28849dc..0000000 --- a/Servers/BaseHttpServer.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace OpenSim.Servers -{ - public class BaseHttpServer - { - } -} diff --git a/Servers/CapsHttpServer.cs b/Servers/CapsHttpServer.cs new file mode 100644 index 0000000..1e62c81 --- /dev/null +++ b/Servers/CapsHttpServer.cs @@ -0,0 +1,332 @@ +/* +Copyright (c) OpenSimCAPS project, http://osgrid.org/ + + +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +using System; +using System.Text; +using Nwc.XmlRpc; +using System.Threading; +using System.Text.RegularExpressions; +using System.Net; +using System.IO; +using System.Collections; +using System.Collections.Generic; +using libsecondlife; +using OpenSim.Framework.Console; +using OpenSim.Framework.Interfaces; + +namespace OpenSim.Servers +{ + // Dummy HTTP server, does nothing useful for now + + public class CapsHttpServer + { + public Thread HTTPD; + public HttpListener Listener; + private string AdminPage; + private string NewAccountForm; + private string LoginForm; + private string passWord = "Admin"; + + public CapsHttpServer() + { + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server"); + HTTPD = new Thread(new ThreadStart(StartHTTP)); + HTTPD.Start(); + LoadAdminPage(); + } + + public void StartHTTP() + { + try + { + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK"); + Listener = new HttpListener(); + + Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/"); + Listener.Start(); + + HttpListenerContext context; + while (true) + { + context = Listener.GetContext(); + ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); + } + } + catch (Exception e) + { + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); + } + } + + private string ParseXMLRPC(string requestBody) + { + try + { + XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); + + Hashtable requestData = (Hashtable)request.Params[0]; + switch (request.MethodName) + { + case "expect_user": + AgentCircuitData agent_data = new AgentCircuitData(); + agent_data.SessionID = new LLUUID((string)requestData["session_id"]); + agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]); + agent_data.firstname = (string)requestData["firstname"]; + agent_data.lastname = (string)requestData["lastname"]; + agent_data.AgentID = new LLUUID((string)requestData["agent_id"]); + agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); + if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote") + { + ((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); + } + return ""; + break; + } + } + catch (Exception e) + { + Console.WriteLine(e.ToString()); + } + return ""; + } + + private string ParseREST(string requestBody, string requestURL, string requestMethod) + { + string responseString = ""; + try + { + switch (requestURL) + { + case "/Admin/Accounts": + if (requestMethod == "GET") + { + responseString = "

Account management

"; + responseString += "
"; + responseString += "

Create New Account

"; + responseString += NewAccountForm; + } + break; + case "/Admin/Clients": + if (requestMethod == "GET") + { + responseString = "

Listing connected Clients

"; + OpenSim.world.Avatar TempAv; + foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) + { + if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") + { + TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID]; + responseString += "

"; + responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()); + responseString += "

"; + } + } + } + break; + case "/Admin/NewAccount": + if (requestMethod == "POST") + { + string[] comp = new string[10]; + string[] passw = new string[3]; + string delimStr = "&"; + char[] delimiter = delimStr.ToCharArray(); + string delimStr2 = "="; + char[] delimiter2 = delimStr2.ToCharArray(); + + //Console.WriteLine(requestBody); + comp = requestBody.Split(delimiter); + passw = comp[3].Split(delimiter2); + if (passw[1] == passWord) + { + responseString = "

New Account created

"; + } + else + { + responseString = "

Admin password is incorrect, please login with the correct password

"; + responseString += "

" + LoginForm; + } + } + break; + case "/Admin/Login": + if (requestMethod == "POST") + { + // Console.WriteLine(requestBody); + if (requestBody == passWord) + { + responseString = "

Login Successful

"; + } + else + { + responseString = "

Password Error

"; + responseString += "

Please Login with the correct password

"; + responseString += "

" + LoginForm; + } + } + break; + case "/Admin/Welcome": + if (requestMethod == "GET") + { + responseString = "Welcome to the OpenSim Admin Page"; + responseString += "


" + LoginForm; + + } + break; + } + } + catch (Exception e) + { + Console.WriteLine(e.ToString()); + } + + return responseString; + } + + private string ParseLLSDXML(string requestBody) + { + // dummy function for now - IMPLEMENT ME! + return ""; + } + + public void HandleRequest(Object stateinfo) + { + // Console.WriteLine("new http incoming"); + HttpListenerContext context = (HttpListenerContext)stateinfo; + + HttpListenerRequest request = context.Request; + HttpListenerResponse response = context.Response; + + response.KeepAlive = false; + response.SendChunked = false; + + System.IO.Stream body = request.InputStream; + System.Text.Encoding encoding = System.Text.Encoding.UTF8; + System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); + + string requestBody = reader.ReadToEnd(); + body.Close(); + reader.Close(); + + //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType); + //Console.WriteLine(requestBody); + + string responseString = ""; + switch (request.ContentType) + { + case "text/xml": + // must be XML-RPC, so pass to the XML-RPC parser + + responseString = ParseXMLRPC(requestBody); + response.AddHeader("Content-type", "text/xml"); + break; + + case "application/xml": + // probably LLSD we hope, otherwise it should be ignored by the parser + responseString = ParseLLSDXML(requestBody); + response.AddHeader("Content-type", "application/xml"); + break; + + case "application/x-www-form-urlencoded": + // a form data POST so send to the REST parser + responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); + response.AddHeader("Content-type", "text/html"); + break; + + case null: + if ((request.HttpMethod == "GET") && (request.RawUrl == "/Admin")) + { + responseString = AdminPage; + response.AddHeader("Content-type", "text/html"); + } + else + { + // must be REST or invalid crap, so pass to the REST parser + responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); + response.AddHeader("Content-type", "text/html"); + } + break; + + } + + byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); + System.IO.Stream output = response.OutputStream; + response.SendChunked = false; + response.ContentLength64 = buffer.Length; + output.Write(buffer, 0, buffer.Length); + output.Close(); + } + + private void LoadAdminPage() + { + try + { + StreamReader SR; + string lines; + AdminPage = ""; + NewAccountForm = ""; + LoginForm = ""; + SR = File.OpenText("testadmin.htm"); + + while (!SR.EndOfStream) + { + lines = SR.ReadLine(); + AdminPage += lines + "\n"; + + } + SR.Close(); + + SR = File.OpenText("newaccountform.htm"); + + while (!SR.EndOfStream) + { + lines = SR.ReadLine(); + NewAccountForm += lines + "\n"; + + } + SR.Close(); + + SR = File.OpenText("login.htm"); + + while (!SR.EndOfStream) + { + lines = SR.ReadLine(); + LoginForm += lines + "\n"; + + } + SR.Close(); + } + catch (Exception e) + { + Console.WriteLine(e.ToString()); + } + + } + } + + +} diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj index 0059bb3..9c66943 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1} + {A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D} Debug AnyCPU @@ -82,7 +82,7 @@ - + Code diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build index 8600ab5..1321629 100644 --- a/Servers/OpenSim.Servers.dll.build +++ b/Servers/OpenSim.Servers.dll.build @@ -11,7 +11,7 @@ - + diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 4d798b3..a473e44 100644 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ diff --git a/prebuild.xml b/prebuild.xml index 3c84703..ee8a2ac 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -95,7 +95,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -188,7 +188,6 @@ - @@ -355,10 +354,9 @@ - - + -- cgit v1.1