From 50f5686d918dbd519f21c0c611bea3f28daf4657 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 24 Mar 2007 08:06:41 +0000
Subject: * Added separate exe project * Prebuild exe is now built in /bin dir
---
OpenSim.RegionServer/OpenSim.RegionServer.csproj | 66 +++++++++++---------
.../OpenSim.RegionServer.dll.build | 68 ++++++++++++++++++++
OpenSim.RegionServer/OpenSimMain.cs | 72 +---------------------
3 files changed, 106 insertions(+), 100 deletions(-)
create mode 100644 OpenSim.RegionServer/OpenSim.RegionServer.dll.build
(limited to 'OpenSim.RegionServer')
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 8129741..b191922 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,24 +1,23 @@
-
+
Local
8.0.50727
2.0
- {50D8594C-39E2-4695-B28D-AC8ADE15BC5A}
+ {457CE564-0922-4F15-846F-147E5BE62D67}
Debug
AnyCPU
-
-
+
- OpenSim
+ OpenSim.RegionServer
JScript
Grid
IE50
false
- Exe
-
-
+ Library
+
OpenSim.RegionServer
+
@@ -29,8 +28,7 @@
TRACE;DEBUG
-
-
+
True
4096
False
@@ -39,8 +37,7 @@
False
False
4
-
-
+
False
@@ -49,8 +46,7 @@
TRACE
-
-
+
False
4096
True
@@ -59,41 +55,48 @@
False
False
4
-
-
+
-
- \System.dll
+
+ System.dll
+ False
-
- \System.Xml.dll.dll
+
+ System.Xml.dll
+ False
-
- \libsecondlife.dll.dll
+
+ ..\bin\libsecondlife.dll
+ False
-
- \Axiom.MathLib.dll.dll
+
+ ..\bin\Axiom.MathLib.dll
+ False
-
- \Db4objects.Db4o.dll.dll
+
+ ..\bin\Db4objects.Db4o.dll
+ False
OpenSim.Framework.Console
- {C8405E1A-EC19-48B6-9C8C-CA03624B9916}
+ {CE124F22-69FC-4499-AE68-1B877C5898C4}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
OpenSim.Physics.Manager
- {58360A80-9333-4E0F-8F83-3CF937E51633}
+ {79C8C9A7-EF80-426D-B815-AC88E7998DFE}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
OpenSim.Framework
- {1D2865A9-CF8E-45F7-B96D-91ED128A32CF}
+ {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
@@ -145,6 +148,9 @@
Code
+
+ Code
+
Code
@@ -171,4 +177,4 @@
-
\ No newline at end of file
+
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
new file mode 100644
index 0000000..dce4dc1
--- /dev/null
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index b2bc0b3..cb184e8 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -48,9 +48,6 @@ using OpenSim.Physics.Manager;
namespace OpenSim
{
- ///
- ///
- ///
public class OpenSimMain : OpenSimApplication
{
private Dictionary clientCircuits = new Dictionary();
@@ -66,76 +63,11 @@ namespace OpenSim
private System.Timers.Timer timer1 = new System.Timers.Timer();
private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll";
- private string _physicsEngine = "basicphysics";
+ public string _physicsEngine = "basicphysics";
public bool sandbox = false;
public bool loginserver = false;
- [STAThread]
- public static void Main(string[] args)
- {
- Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
- Console.WriteLine("Starting...\n");
- OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);
-
- //OpenSimRoot.instance = new OpenSimRoot();
- OpenSimMain sim = new OpenSimMain();
- OpenSimRoot.Instance.Application = sim;
-
- sim.sandbox = false;
- sim.loginserver = false;
- sim._physicsEngine = "basicphysics";
-
- for (int i = 0; i < args.Length; i++)
- {
- if (args[i] == "-sandbox")
- {
- sim.sandbox = true;
- OpenSimRoot.Instance.Sandbox = true;
- }
-
- if (args[i] == "-loginserver")
- {
- sim.loginserver = true;
- }
- if (args[i] == "-realphysx")
- {
- sim._physicsEngine = "RealPhysX";
- OpenSim.world.Avatar.PhysicsEngineFlying = true;
- }
- }
-
-
- OpenSimRoot.Instance.GridServers = new Grid();
- if (sim.sandbox)
- {
- OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
- OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
- OpenSimRoot.Instance.GridServers.Initialise();
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode");
- }
- else
- {
- OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
- OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
- OpenSimRoot.Instance.GridServers.Initialise();
- 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();
-
- while (true)
- {
- OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
- }
- }
-
- private OpenSimMain()
+ public OpenSimMain()
{
}
--
cgit v1.1