diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 856505f698..378d2610ed 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE} + {0CE4ED02-8BB2-439C-8225-E42F2D661D44} Debug AnyCPU @@ -74,16 +74,18 @@ ..\bin\OpenSim.Framework.dll False - - ..\bin\OpenSim.Framework.Console.dll - False - ..\bin\libsecondlife.dll False + + OpenSim.Framework.Console + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 1b67165b1c..c27c0f7e08 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {36895293-A627-42EC-BA77-6AF6F5A4A7DF} + {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9} Debug AnyCPU - - + OpenGridServices.UserServer @@ -16,11 +15,9 @@ IE50 false Exe - - + OpenGridServices.UserServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,36 +55,37 @@ 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 + + OpenSim.Framework.Console + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + @@ -110,4 +105,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 80796ea6bb..c3486052d8 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 - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD} + {A6463B2D-0956-4680-9D03-082199779C66} Debug AnyCPU @@ -82,13 +82,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {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 3dfa7ceb18..e5767288ed 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 bd10ce213d..3572f4af09 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 - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index b81afb5364..014dd57686 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} Debug AnyCPU diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index e504a0a913..4401b969e1 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 - {21403281-9649-4CE8-869C-E4F2075DEE94} + {CBC22F47-9CF2-4748-B6C6-85CDAB267554} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {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 ec65ba8c71..6bf398e574 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 fe32cd6874..a8a676089f 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 - {BFCBC85D-2071-4294-923C-EC62D841A219} + {76C00C0A-1AEF-49C9-8E4E-19A529B364E8} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {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 206045444e..dd6db181d1 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 23985fda9b..ec632b16c1 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 - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD} + {E168B13F-8D18-43E7-8546-C0EC1899579F} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} {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 f14673337a..3497a55352 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 0055c9caf3..b4679a91c9 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 - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} Debug AnyCPU @@ -72,9 +72,15 @@ + + OpenSim.Framework + {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {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 47e55347cc..4b5ee51cc6 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -25,7 +25,8 @@ - + + diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 7e83efde93..6fd3e8c94f 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 - {C81B7E61-943D-4190-87C3-CB02BF67A2B3} + {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} {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 8e49f8f554..f25361a432 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 d2039a12a4..8d36b0049f 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 - {E1510E0F-EFCB-4702-BCB6-96A084454B55} + {0EF13F92-86F1-403D-882A-AA9DD4421B32} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} {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 8f9e7dc80f..5ab70bb7c1 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 a482e80219..9f85598327 100644 --- a/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim.RegionServer/AgentAssetUpload.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using OpenSim.Assets; using OpenSim.Framework.Assets; using OpenSim.Framework.Utilities; using libsecondlife; @@ -12,10 +13,14 @@ namespace OpenSim { private Dictionary transactions = new Dictionary(); private SimClient ourClient; + private AssetCache m_assetCache; + private InventoryCache m_inventoryCache; - public AgentAssetUpload(SimClient client) + public AgentAssetUpload(SimClient client, AssetCache assetCache, InventoryCache inventoryCache) { this.ourClient = client; + m_assetCache = assetCache; + m_inventoryCache = inventoryCache; } public void AddUpload(LLUUID transactionID, AssetBase asset) @@ -148,8 +153,8 @@ namespace OpenSim //check if we should add it to inventory if (trans.AddToInventory) { - OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); - OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); + m_assetCache.AddAsset(trans.Asset); + m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); } @@ -176,7 +181,7 @@ namespace OpenSim AssetTransaction trans = this.transactions[transactionID]; if (trans.UploadComplete) { - OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); + m_assetCache.AddAsset(trans.Asset); asset = trans.Asset; } } @@ -195,8 +200,8 @@ namespace OpenSim if (trans.UploadComplete) { //already complete so we can add it to the inventory - OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); - Console.WriteLine( "ITem created is " +OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); + m_assetCache.AddAsset(trans.Asset); + Console.WriteLine( "ITem created is " +m_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 ea325897a0..03f86923ca 100644 --- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs +++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; +using OpenSim.world; namespace OpenSim.CAPS { @@ -11,9 +12,11 @@ namespace OpenSim.CAPS private string NewAccountForm; private string LoginForm; private string passWord = "Admin"; + private World m_world; - public AdminWebFront(string password) + public AdminWebFront(string password, World world) { + m_world = world; passWord = password; LoadAdminPage(); } @@ -45,11 +48,11 @@ namespace OpenSim.CAPS { responseString = "

Listing connected Clients

"; OpenSim.world.Avatar TempAv; - foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) + foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys) { - if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") + if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar") { - TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID]; + TempAv = (OpenSim.world.Avatar)m_world.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 a1073f0427..92bbc6f3b3 100644 --- a/OpenSim.RegionServer/CAPS/SimHttp.cs +++ b/OpenSim.RegionServer/CAPS/SimHttp.cs @@ -39,22 +39,27 @@ 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 + public class SimCAPSHTTPServer : BaseHttpServer { - public Thread HTTPD; - public HttpListener Listener; - private Dictionary restHandlers = new Dictionary(); + private Thread m_workerThread; + private HttpListener m_httpListener; + private Dictionary m_restHandlers = new Dictionary(); + private IGridServer m_gridServer; + private int m_port; - public SimCAPSHTTPServer() + public SimCAPSHTTPServer(IGridServer gridServer, int port) { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server"); - HTTPD = new Thread(new ThreadStart(StartHTTP)); - HTTPD.Start(); + m_workerThread = new Thread(new ThreadStart(StartHTTP)); + m_workerThread.Start(); + m_gridServer = gridServer; + m_port = port; } public void StartHTTP() @@ -62,15 +67,15 @@ namespace OpenSim.CAPS try { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK"); - Listener = new HttpListener(); + m_httpListener = new HttpListener(); - Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/"); - Listener.Start(); + m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); + m_httpListener.Start(); HttpListenerContext context; while (true) { - context = Listener.GetContext(); + context = m_httpListener.GetContext(); ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); } } @@ -82,9 +87,9 @@ namespace OpenSim.CAPS public bool AddRestHandler(string path, IRestHandler handler) { - if (!this.restHandlers.ContainsKey(path)) + if (!this.m_restHandlers.ContainsKey(path)) { - this.restHandlers.Add(path, handler); + this.m_restHandlers.Add(path, handler); return true; } @@ -108,12 +113,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 (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote") + if (m_gridServer.GetName() == "Remote") { - ((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); + + ((RemoteGridBase)m_gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); } return ""; - break; } } catch (Exception e) @@ -135,9 +140,9 @@ namespace OpenSim.CAPS //path[0] should be empty so we are interested in path[1] if (path.Length > 1) { - if ((path[1] != "") && (this.restHandlers.ContainsKey(path[1]))) + if ((path[1] != "") && (this.m_restHandlers.ContainsKey(path[1]))) { - responseString = this.restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod); + responseString = this.m_restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod); } } diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index f376e04951..1ce2837aa8 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {4171D545-81F5-4C64-AD29-6D7414C38181} + {ADD974E2-994C-4998-864E-4B54D8AD5F00} Debug AnyCPU - - + OpenSim.RegionServer @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.RegionServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,58 +55,60 @@ 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 + {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False - - OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + + OpenSim.Servers + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False Code - - Code @@ -146,6 +142,12 @@ Code + + Code + + + Code + Code @@ -193,4 +195,4 @@ - \ No newline at end of file + diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 4e44c4b102..04e86bcc6b 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -49,9 +49,10 @@ - - - + + + + diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 7425fca690..d6453e24c7 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.LocalWorld = new World(OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.Cfg.RegionHandle, OpenSimRoot.Instance.Cfg.RegionName, OpenSimRoot.Instance.Cfg); 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.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin")); + OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort); + OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin", OpenSimRoot.Instance.LocalWorld)); 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); + 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); //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 d463c75e4e..698053d048 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -71,6 +71,13 @@ 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) { @@ -105,15 +112,15 @@ namespace OpenSim switch (Pack.Type) { case PacketType.CompleteAgentMovement: - ClientAvatar.CompleteMovement(OpenSimRoot.Instance.LocalWorld); + ClientAvatar.CompleteMovement(m_world); ClientAvatar.SendInitialPosition(); break; case PacketType.RegionHandshakeReply: - OpenSimRoot.Instance.LocalWorld.SendLayerData(this); + m_world.SendLayerData(this); break; case PacketType.AgentWearablesRequest: ClientAvatar.SendInitialAppearance(); - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { if (client.AgentID != this.AgentID) { @@ -122,7 +129,7 @@ namespace OpenSim client.ClientAvatar.SendAppearanceToOtherAgent(this); } } - OpenSimRoot.Instance.LocalWorld.GetInitialPrims(this); + m_world.GetInitialPrims(this); break; case PacketType.AgentIsNowWearing: AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; @@ -134,7 +141,7 @@ namespace OpenSim this.ClientAvatar.SetAppearance(appear); break; case PacketType.ObjectAdd: - OpenSimRoot.Instance.LocalWorld.AddNewPrim((ObjectAddPacket)Pack, this); + m_world.AddNewPrim((ObjectAddPacket)Pack, this); break; case PacketType.ObjectLink: OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); @@ -146,7 +153,7 @@ namespace OpenSim ObjectShapePacket shape = (ObjectShapePacket)Pack; for (int i = 0; i < shape.ObjectData.Length; i++) { - foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == shape.ObjectData[i].ObjectLocalID) { @@ -163,7 +170,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 OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -177,7 +184,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 OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -190,7 +197,7 @@ namespace OpenSim { libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); - foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) { @@ -204,13 +211,13 @@ namespace OpenSim RequestImagePacket imageRequest = (RequestImagePacket)Pack; for (int i = 0; i < imageRequest.RequestImage.Length; i++) { - OpenSimRoot.Instance.AssetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image); + m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image); } break; case PacketType.TransferRequest: //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); TransferRequestPacket transfer = (TransferRequestPacket)Pack; - OpenSimRoot.Instance.AssetCache.AddAssetRequest(this, transfer); + m_assetCache.AddAssetRequest(this, transfer); break; case PacketType.AgentUpdate: ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack); @@ -230,18 +237,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 OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(kill); } - OpenSimRoot.Instance.GridServers.GridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode); - lock (OpenSimRoot.Instance.LocalWorld.Entities) + m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode); + lock (m_world.Entities) { - OpenSimRoot.Instance.LocalWorld.Entities.Remove(this.AgentID); + m_world.Entities.Remove(this.AgentID); } //need to do other cleaning up here too - OpenSimRoot.Instance.ClientThreads.Remove(this.CircuitCode); //this.userEP); - OpenSimRoot.Instance.Application.RemoveClientCircuit(this.CircuitCode); + m_clientThreads.Remove(this.CircuitCode); //this.userEP); + m_application.RemoveClientCircuit(this.CircuitCode); this.ClientThread.Abort(); break; case PacketType.ChatFromViewer: @@ -258,7 +265,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 OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(reply); } @@ -267,7 +274,7 @@ namespace OpenSim ObjectImagePacket imagePack = (ObjectImagePacket)Pack; for (int i = 0; i < imagePack.ObjectData.Length; i++) { - foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == imagePack.ObjectData[i].ObjectLocalID) { @@ -278,7 +285,7 @@ namespace OpenSim break; case PacketType.ObjectFlagUpdate: ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; - foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in m_world.Entities.Values) { if (ent.localid == flags.AgentData.ObjectLocalID) { @@ -306,7 +313,7 @@ namespace OpenSim break; case PacketType.CreateInventoryFolder: CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; - OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); + m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); Console.WriteLine(Pack.ToString()); break; case PacketType.CreateInventoryItem: @@ -320,11 +327,11 @@ namespace OpenSim case PacketType.FetchInventory: //Console.WriteLine("fetch item packet"); FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; - OpenSimRoot.Instance.InventoryCache.FetchInventory(this, FetchInventory); + m_inventoryCache.FetchInventory(this, FetchInventory); break; case PacketType.FetchInventoryDescendents: FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; - OpenSimRoot.Instance.InventoryCache.FetchInventoryDescendents(this, Fetch); + m_inventoryCache.FetchInventoryDescendents(this, Fetch); break; case PacketType.UpdateInventoryItem: UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; @@ -332,17 +339,17 @@ namespace OpenSim { if (update.InventoryData[i].TransactionID != LLUUID.Zero) { - AssetBase asset = OpenSimRoot.Instance.AssetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); + AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); if (asset != null) { - OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); + m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); } else { asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); if (asset != null) { - OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); + m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); } } } @@ -350,7 +357,7 @@ namespace OpenSim break; case PacketType.ViewerEffect: ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { if (client.AgentID != this.AgentID) { @@ -362,7 +369,7 @@ namespace OpenSim break; case PacketType.DeRezObject: //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet"); - OpenSimRoot.Instance.LocalWorld.DeRezObject((DeRezObjectPacket)Pack, this); + m_world.DeRezObject((DeRezObjectPacket)Pack, this); break; } } @@ -501,11 +508,11 @@ namespace OpenSim if (Pack.Header.Zerocoded) { int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer); - OpenSimRoot.Instance.Application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP); + m_application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP); } else { - OpenSimRoot.Instance.Application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP); + m_application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP); } } catch (Exception) @@ -569,14 +576,22 @@ namespace OpenSim this.PacketQueue.Enqueue(item); } - public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack) + public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimApplication application, InventoryCache inventoryCache, bool sandboxMode) { + 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); + this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache ); AckTimer = new System.Timers.Timer(500); AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); AckTimer.Start(); @@ -608,14 +623,16 @@ namespace OpenSim protected virtual void InitNewClient() { OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); - OpenSimRoot.Instance.LocalWorld.AddViewerAgent(this); - world.Entity tempent = OpenSimRoot.Instance.LocalWorld.Entities[this.AgentID]; + + m_world.AddViewerAgent(this); + world.Entity tempent = m_world.Entities[this.AgentID]; + this.ClientAvatar = (world.Avatar)tempent; } protected virtual void AuthUser() { - AuthenticateResponse sessionInfo = OpenSimRoot.Instance.GridServers.GridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); + AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); if (!sessionInfo.Authorised) { //session/circuit not authorised @@ -638,23 +655,23 @@ namespace OpenSim } // Create Inventory, currently only works for sandbox mode - if (OpenSimRoot.Instance.Sandbox) + if (m_sandboxMode) { if (sessionInfo.LoginInfo.InventoryFolder != null) { this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder); if (sessionInfo.LoginInfo.BaseFolder != null) { - OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder); + m_inventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder); this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder; - AssetBase[] inventorySet = OpenSimRoot.Instance.AssetCache.CreateNewInventorySet(this.AgentID); + AssetBase[] inventorySet = m_assetCache.CreateNewInventorySet(this.AgentID); if (inventorySet != null) { for (int i = 0; i < inventorySet.Length; i++) { if (inventorySet[i] != null) { - OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]); + m_inventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]); } } } @@ -670,8 +687,8 @@ namespace OpenSim { AgentInventory inventory = new AgentInventory(); inventory.AgentID = this.AgentID; - OpenSimRoot.Instance.InventoryCache.AddNewAgentsInventory(inventory); - OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, baseFolder); + m_inventoryCache.AddNewAgentsInventory(inventory); + m_inventoryCache.CreateNewInventoryFolder(this, baseFolder); } } } diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs index 83e340b473..eee1c3ae1b 100644 --- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs +++ b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs @@ -12,11 +12,15 @@ namespace OpenSim.UserServer { class LocalUserProfileManager : UserProfileManager { - private IGridServer _gridServer; + private IGridServer m_gridServer; + private int m_port; + private string m_ipAddr; - public LocalUserProfileManager(IGridServer gridServer) + public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr) { - _gridServer = gridServer; + m_gridServer = gridServer; + m_port = simPort; + m_ipAddr = ipAddr; } public override void InitUserProfiles() @@ -29,8 +33,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"] = OpenSimRoot.Instance.Cfg.IPListenPort; - response["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr; + response["sim_port"] = m_port; + response["sim_ip"] = m_ipAddr; response["region_y"] = (Int32)996 * 256; response["region_x"] = (Int32)997* 256; @@ -67,9 +71,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 (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local") + if (m_gridServer.GetName() == "Local") { - ((LocalGridBase)this._gridServer).AddNewSession(_login); + ((LocalGridBase)this.m_gridServer).AddNewSession(_login); } } } diff --git a/OpenSim.RegionServer/UserServer/LoginServer.cs b/OpenSim.RegionServer/UserServer/LoginServer.cs index 86b098a9ca..47af8a88b8 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 _gridServer; + private IGridServer m_gridServer; private ushort _loginPort = 8080; public IPAddress clientAddress = IPAddress.Loopback; public IPAddress remoteAddress = IPAddress.Any; @@ -63,10 +63,14 @@ 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) + public LoginServer(IGridServer gridServer, string simAddr, int simPort) { - _gridServer = gridServer; + m_gridServer = gridServer; + m_simPort = simPort; + m_simAddr = simAddr; } // InitializeLogin: initialize the login @@ -89,7 +93,7 @@ namespace OpenSim.UserServer SR.Close(); this._mpasswd = EncodePassword("testpass"); - userManager = new LocalUserProfileManager(this._gridServer); + userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr ); userManager.InitUserProfiles(); userManager.SetKeys("", "", "", "Welcome to OpenSim"); @@ -289,8 +293,8 @@ namespace OpenSim.UserServer XmlRpcResponse response = (XmlRpcResponse)(new XmlRpcResponseDeserializer()).Deserialize(this._defaultResponse); Hashtable responseData = (Hashtable)response.Value; - responseData["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort; - responseData["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr; + responseData["sim_port"] = m_simPort; + responseData["sim_ip"] = m_simAddr; responseData["agent_id"] = Agent.ToStringHyphenated(); responseData["session_id"] = Session.ToStringHyphenated(); responseData["secure_session_id"]= secureSess.ToStringHyphenated(); @@ -327,9 +331,9 @@ namespace OpenSim.UserServer _login.InventoryFolder = InventoryFolderID; //working on local computer if so lets add to the gridserver's list of sessions? - if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local") + if (m_gridServer.GetName() == "Local") { - ((LocalGridBase)this._gridServer).AddNewSession(_login); + ((LocalGridBase)m_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 75f2cff948..2ae99926ed 100644 --- a/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim.RegionServer/world/Avatar.cs @@ -30,14 +30,23 @@ 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) + public Avatar(SimClient TheClient, World world, string regionName, Dictionary clientThreads, ulong regionHandle) { + 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 + (OpenSimRoot.Instance.LocalWorld._localNumber++); + localid = 8880000 + (m_world._localNumber++); position = new LLVector3(100.0f, 100.0f, 30.0f); - position.Z = OpenSimRoot.Instance.LocalWorld.LandMap[(int)position.Y * 256 + (int)position.X] + 1; + position.Z = m_world.LandMap[(int)position.Y * 256 + (int)position.X] + 1; visualParams = new byte[218]; for (int i = 0; i < 218; i++) { @@ -52,7 +61,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 @@ -96,11 +105,11 @@ namespace OpenSim.world //use CreateTerseBlock() ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME + terse.RegionData.RegionHandle = m_regionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = terseBlock; - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(terse); } @@ -119,11 +128,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 = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME + terse.RegionData.RegionHandle = m_regionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = terseBlock; - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(terse); } @@ -172,7 +181,7 @@ namespace OpenSim.world AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); mov.AgentData.SessionID = this.ControllingClient.SessionID; mov.AgentData.AgentID = this.ControllingClient.AgentID; - mov.Data.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; + mov.Data.RegionHandle = m_regionHandle; // TODO - dynamicalise this stuff mov.Data.Timestamp = 1172750370; mov.Data.Position = new LLVector3(100f, 100f, 23f); @@ -187,7 +196,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 = OpenSimRoot.Instance.Cfg.RegionHandle; + objupdate.RegionData.RegionHandle = m_regionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -202,9 +211,9 @@ namespace OpenSim.world byte[] pb = pos2.GetBytes(); Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); - OpenSimRoot.Instance.LocalWorld._localNumber++; + m_world._localNumber++; - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(objupdate); if (client.AgentID != ControllingClient.AgentID) @@ -241,7 +250,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 = OpenSimRoot.Instance.Cfg.RegionHandle; + objupdate.RegionData.RegionHandle = m_regionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -293,7 +302,7 @@ namespace OpenSim.world this.visualParams[i] = appear.VisualParam[i].ParamValue; } - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { if (client.AgentID != ControllingClient.AgentID) { @@ -490,7 +499,7 @@ namespace OpenSim.world handshake.RegionInfo.SimAccess = 13; handshake.RegionInfo.WaterHeight = 20; handshake.RegionInfo.RegionFlags = 72458694; - handshake.RegionInfo.SimName = _enc.GetBytes(OpenSimRoot.Instance.Cfg.RegionName + "\0"); + handshake.RegionInfo.SimName = _enc.GetBytes(m_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 6ff66a3847..a185f0bc70 100644 --- a/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim.RegionServer/world/Primitive.cs @@ -22,6 +22,9 @@ 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 { @@ -65,10 +68,14 @@ namespace OpenSim.world } } - public Primitive() + public Primitive(Dictionary clientThreads, ulong regionHandle, World world) { mesh_cutbegin = 0.0f; mesh_cutend = 1.0f; + + m_clientThreads = clientThreads; + m_regionHandle = regionHandle; + m_world = world; } public override Mesh getMesh() @@ -99,7 +106,7 @@ namespace OpenSim.world { if (this.newPrimFlag) { - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(OurPacket); } @@ -108,11 +115,11 @@ namespace OpenSim.world else if (this.updateFlag) { ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME + terse.RegionData.RegionHandle = m_regionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = this.CreateImprovedBlock(); - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(terse); } @@ -120,7 +127,7 @@ namespace OpenSim.world } else if (this.dirtyFlag) { - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { UpdateClient(client); } @@ -131,11 +138,11 @@ namespace OpenSim.world if (this._physActor != null && this.physicsEnabled) { ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); - terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME + terse.RegionData.RegionHandle = m_regionHandle; // FIXME terse.RegionData.TimeDilation = 64096; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; terse.ObjectData[0] = this.CreateImprovedBlock(); - foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(terse); } @@ -255,7 +262,7 @@ namespace OpenSim.world public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) { ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); - objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; + objupdate.RegionData.RegionHandle = m_regionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -323,7 +330,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 = OpenSimRoot.Instance.Cfg.RegionHandle; + objupdate.RegionData.RegionHandle = m_regionHandle; objupdate.RegionData.TimeDilation = 64096; objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; @@ -480,7 +487,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); - OpenSimRoot.Instance.LocalWorld.localStorage.StorePrim(this.primData); + m_world.localStorage.StorePrim(this.primData); } } diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index e6d8921e0d..0d126e6b87 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs @@ -25,10 +25,19 @@ namespace OpenSim.world private Random Rand = new Random(); private uint _primCount = 702000; private int storageCount; + private Dictionary m_clientThreads; + private ulong m_regionHandle; + private string m_regionName; + private SimConfig m_cfg; - public World() + public World(Dictionary clientThreads, ulong regionHandle, string regionName, SimConfig cfg) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); + m_clientThreads = clientThreads; + m_regionHandle = regionHandle; + m_regionName = regionName; + m_cfg = cfg; + + 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"); @@ -115,9 +124,9 @@ namespace OpenSim.world HeightmapGenHills hills = new HeightmapGenHills(); this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false); this.phyScene.SetTerrain(this.LandMap); - OpenSimRoot.Instance.Cfg.SaveMap(this.LandMap); + m_cfg.SaveMap(this.LandMap); - foreach(SimClient client in OpenSimRoot.Instance.ClientThreads.Values) { + foreach(SimClient client in m_clientThreads.Values) { this.SendLayerData(client); } } @@ -134,7 +143,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(); + Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); nPrim.CreateFromStorage(prim); this.Entities.Add(nPrim.uuid, nPrim); } @@ -175,7 +184,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); + Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle ); 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); @@ -187,7 +196,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(); + Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this ); 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); @@ -210,7 +219,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 OpenSimRoot.Instance.LocalWorld.Entities.Values) + foreach (Entity ent in this.Entities.Values) { if (ent.localid == Data.ObjectLocalID) { @@ -220,7 +229,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 OpenSimRoot.Instance.ClientThreads.Values) + foreach (SimClient client in m_clientThreads.Values) { client.OutPacket(kill); } @@ -234,9 +243,9 @@ namespace OpenSim.world } foreach( libsecondlife.LLUUID uuid in DeRezEnts ) { - lock (OpenSimRoot.Instance.LocalWorld.Entities) + lock (this.Entities) { - OpenSimRoot.Instance.LocalWorld.Entities.Remove(uuid); + this.Entities.Remove(uuid); } } diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 1f2eb240fa..024dcfc496 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 - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2} + {55969A66-0E92-4F76-BFF6-2256C6A5CAF7} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {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 44e8597715..550eaa5cd5 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 c61b728fb6..b012a1b092 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -46,7 +46,7 @@ - + @@ -56,16 +56,18 @@ + - + + @@ -88,7 +90,7 @@ - + @@ -98,10 +100,11 @@ + - + diff --git a/OpenSim.sln b/OpenSim.sln index 8370bef7aa..207bbbadfc 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,97 +1,130 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E1510E0F-EFCB-4702-BCB6-96A084454B55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{7AED7536-7D6B-4E28-8016-B5A554C663B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{4B0A7290-36C2-4C74-B9B4-07775B031CF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{A6463B2D-0956-4680-9D03-082199779C66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{36895293-A627-42EC-BA77-6AF6F5A4A7DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{BFCBC85D-2071-4294-923C-EC62D841A219}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{76C00C0A-1AEF-49C9-8E4E-19A529B364E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{55969A66-0E92-4F76-BFF6-2256C6A5CAF7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{BD7866A4-04BA-47F0-905F-B2359118F5B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{0CE4ED02-8BB2-439C-8225-E42F2D661D44}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{C81B7E61-943D-4190-87C3-CB02BF67A2B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{E168B13F-8D18-43E7-8546-C0EC1899579F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{4171D545-81F5-4C64-AD29-6D7414C38181}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{ADD974E2-994C-4998-864E-4B54D8AD5F00}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{21403281-9649-4CE8-869C-E4F2075DEE94}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{2EAB18A1-8187-4C79-9947-A671F9C007D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{CBC22F47-9CF2-4748-B6C6-85CDAB267554}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{0EF13F92-86F1-403D-882A-AA9DD4421B32}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + ({B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}).2 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}).3 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({A6463B2D-0956-4680-9D03-082199779C66}).5 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({A6463B2D-0956-4680-9D03-082199779C66}).6 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}).4 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({76C00C0A-1AEF-49C9-8E4E-19A529B364E8}).3 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({76C00C0A-1AEF-49C9-8E4E-19A529B364E8}).4 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({55969A66-0E92-4F76-BFF6-2256C6A5CAF7}).4 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({55969A66-0E92-4F76-BFF6-2256C6A5CAF7}).5 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({0CE4ED02-8BB2-439C-8225-E42F2D661D44}).4 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}).2 = ({2EAB18A1-8187-4C79-9947-A671F9C007D9}) + ({E168B13F-8D18-43E7-8546-C0EC1899579F}).2 = ({2EAB18A1-8187-4C79-9947-A671F9C007D9}) + ({8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}).5 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}).6 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}).7 = ({2EAB18A1-8187-4C79-9947-A671F9C007D9}) + ({8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}).8 = ({ADD974E2-994C-4998-864E-4B54D8AD5F00}) + ({ADD974E2-994C-4998-864E-4B54D8AD5F00}).5 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({ADD974E2-994C-4998-864E-4B54D8AD5F00}).6 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({ADD974E2-994C-4998-864E-4B54D8AD5F00}).7 = ({2EAB18A1-8187-4C79-9947-A671F9C007D9}) + ({ADD974E2-994C-4998-864E-4B54D8AD5F00}).8 = ({B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}) + ({2EAB18A1-8187-4C79-9947-A671F9C007D9}).3 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({2EAB18A1-8187-4C79-9947-A671F9C007D9}).4 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({CBC22F47-9CF2-4748-B6C6-85CDAB267554}).4 = ({BD7866A4-04BA-47F0-905F-B2359118F5B2}) + ({CBC22F47-9CF2-4748-B6C6-85CDAB267554}).5 = ({4B0A7290-36C2-4C74-B9B4-07775B031CF2}) + ({0EF13F92-86F1-403D-882A-AA9DD4421B32}).3 = ({2EAB18A1-8187-4C79-9947-A671F9C007D9}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Release|Any CPU.Build.0 = Release|Any CPU + {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Release|Any CPU.Build.0 = Release|Any CPU + {A6463B2D-0956-4680-9D03-082199779C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6463B2D-0956-4680-9D03-082199779C66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6463B2D-0956-4680-9D03-082199779C66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6463B2D-0956-4680-9D03-082199779C66}.Release|Any CPU.Build.0 = Release|Any CPU + {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Release|Any CPU.Build.0 = Release|Any CPU + {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Release|Any CPU.Build.0 = Release|Any CPU + {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Release|Any CPU.Build.0 = Release|Any CPU + {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Release|Any CPU.Build.0 = Release|Any CPU + {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Release|Any CPU.Build.0 = Release|Any CPU + {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Release|Any CPU.Build.0 = Release|Any CPU + {E168B13F-8D18-43E7-8546-C0EC1899579F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E168B13F-8D18-43E7-8546-C0EC1899579F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E168B13F-8D18-43E7-8546-C0EC1899579F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E168B13F-8D18-43E7-8546-C0EC1899579F}.Release|Any CPU.Build.0 = Release|Any CPU + {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Release|Any CPU.Build.0 = Release|Any CPU + {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Release|Any CPU.Build.0 = Release|Any CPU + {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Release|Any CPU.Build.0 = Release|Any CPU + {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Release|Any CPU.Build.0 = Release|Any CPU + {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index bf575159d3..8e0d2638e3 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6} + {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {BD7866A4-04BA-47F0-905F-B2359118F5B2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {2EAB18A1-8187-4C79-9947-A671F9C007D9} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.RegionServer - {4171D545-81F5-4C64-AD29-6D7414C38181} + {ADD974E2-994C-4998-864E-4B54D8AD5F00} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index 7d69d90e1e..613f5275a2 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 3612d49a70..a0037b18c0 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"); } - if (sim.loginserver && sim.sandbox) - { - LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); - loginServer.Startup(); - } - 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.Startup(); + } + while (true) { OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 55052249dd..6dcce98ec1 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", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 + {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.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 bd366dccfb..0f0deb2462 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, ReferenceNode refr) + private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr) { string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - 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; + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + + string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); + + return finalPath; } else { @@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - 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; - } + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/'); + + return finalPath; + } else { ProjectNode project = (ProjectNode)refr.Parent; @@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets { if (refr.LocalCopy) { - ss.WriteLine(" ", '/')); + ss.WriteLine(" ", '/')); } } ss.WriteLine(" "); @@ -316,7 +315,8 @@ namespace Prebuild.Core.Targets ss.WriteLine(" "); foreach(ReferenceNode refr in project.References) { - ss.WriteLine(" ", '/')); + string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/'); + ss.WriteLine(" " ); } ss.WriteLine(" "); diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index eddfe74d93..34daca99f4 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54} + {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0} Debug AnyCPU App.ico diff --git a/Servers/BaseHttpServer.cs b/Servers/BaseHttpServer.cs new file mode 100644 index 0000000000..28849dca93 --- /dev/null +++ b/Servers/BaseHttpServer.cs @@ -0,0 +1,10 @@ +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 deleted file mode 100644 index 1e62c8183e..0000000000 --- a/Servers/CapsHttpServer.cs +++ /dev/null @@ -1,332 +0,0 @@ -/* -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 9c66943f4d..460f7e2341 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D} + {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE} Debug AnyCPU @@ -66,23 +66,30 @@ System.Xml.dll False - - ..\bin\OpenSim.Framework.dll - False - - - ..\bin\OpenSim.Framework.Console.dll - False - ..\bin\libsecondlife.dll False
+ + OpenSim.Framework + {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Framework.Console + {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + - + + Code + + Code diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build index 1321629d56..f3845fb166 100644 --- a/Servers/OpenSim.Servers.dll.build +++ b/Servers/OpenSim.Servers.dll.build @@ -11,7 +11,8 @@ - + + diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index a473e449a6..4d798b36e4 100644 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ diff --git a/prebuild.xml b/prebuild.xml index ee8a2ace84..3c847033fc 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -95,7 +95,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -188,6 +188,7 @@ + @@ -354,9 +355,10 @@ + - +