diff options
author | lbsa71 | 2007-03-24 08:06:41 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-24 08:06:41 +0000 |
commit | 50f5686d918dbd519f21c0c611bea3f28daf4657 (patch) | |
tree | 769f71b6f5854b524fd5895fc05718da6a1991da /OpenSim.RegionServer/OpenSimMain.cs | |
parent | Added Fly animation (diff) | |
download | opensim-SC-50f5686d918dbd519f21c0c611bea3f28daf4657.zip opensim-SC-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.gz opensim-SC-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.bz2 opensim-SC-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.xz |
* Added separate exe project
* Prebuild exe is now built in /bin dir
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 72 |
1 files changed, 2 insertions, 70 deletions
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; | |||
48 | 48 | ||
49 | namespace OpenSim | 49 | namespace OpenSim |
50 | { | 50 | { |
51 | /// <summary> | ||
52 | /// | ||
53 | /// </summary> | ||
54 | public class OpenSimMain : OpenSimApplication | 51 | public class OpenSimMain : OpenSimApplication |
55 | { | 52 | { |
56 | private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); | 53 | private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); |
@@ -66,76 +63,11 @@ namespace OpenSim | |||
66 | 63 | ||
67 | private System.Timers.Timer timer1 = new System.Timers.Timer(); | 64 | private System.Timers.Timer timer1 = new System.Timers.Timer(); |
68 | private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; | 65 | private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; |
69 | private string _physicsEngine = "basicphysics"; | 66 | public string _physicsEngine = "basicphysics"; |
70 | public bool sandbox = false; | 67 | public bool sandbox = false; |
71 | public bool loginserver = false; | 68 | public bool loginserver = false; |
72 | 69 | ||
73 | [STAThread] | 70 | public OpenSimMain() |
74 | public static void Main(string[] args) | ||
75 | { | ||
76 | Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); | ||
77 | Console.WriteLine("Starting...\n"); | ||
78 | OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0); | ||
79 | |||
80 | //OpenSimRoot.instance = new OpenSimRoot(); | ||
81 | OpenSimMain sim = new OpenSimMain(); | ||
82 | OpenSimRoot.Instance.Application = sim; | ||
83 | |||
84 | sim.sandbox = false; | ||
85 | sim.loginserver = false; | ||
86 | sim._physicsEngine = "basicphysics"; | ||
87 | |||
88 | for (int i = 0; i < args.Length; i++) | ||
89 | { | ||
90 | if (args[i] == "-sandbox") | ||
91 | { | ||
92 | sim.sandbox = true; | ||
93 | OpenSimRoot.Instance.Sandbox = true; | ||
94 | } | ||
95 | |||
96 | if (args[i] == "-loginserver") | ||
97 | { | ||
98 | sim.loginserver = true; | ||
99 | } | ||
100 | if (args[i] == "-realphysx") | ||
101 | { | ||
102 | sim._physicsEngine = "RealPhysX"; | ||
103 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | ||
104 | } | ||
105 | } | ||
106 | |||
107 | |||
108 | OpenSimRoot.Instance.GridServers = new Grid(); | ||
109 | if (sim.sandbox) | ||
110 | { | ||
111 | OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; | ||
112 | OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; | ||
113 | OpenSimRoot.Instance.GridServers.Initialise(); | ||
114 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode"); | ||
115 | } | ||
116 | else | ||
117 | { | ||
118 | OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll"; | ||
119 | OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; | ||
120 | OpenSimRoot.Instance.GridServers.Initialise(); | ||
121 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode"); | ||
122 | } | ||
123 | |||
124 | if (sim.loginserver && sim.sandbox) | ||
125 | { | ||
126 | LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer); | ||
127 | loginServer.Startup(); | ||
128 | } | ||
129 | |||
130 | OpenSimRoot.Instance.StartUp(); | ||
131 | |||
132 | while (true) | ||
133 | { | ||
134 | OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); | ||
135 | } | ||
136 | } | ||
137 | |||
138 | private OpenSimMain() | ||
139 | { | 71 | { |
140 | } | 72 | } |
141 | 73 | ||