aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main.cs')
-rw-r--r--src/Main.cs20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/Main.cs b/src/Main.cs
index 0680cbb..18418d1 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -71,7 +71,7 @@ namespace OpenSim
71 private PhysicsManager physManager; 71 private PhysicsManager physManager;
72 private System.Timers.Timer timer1 = new System.Timers.Timer(); 72 private System.Timers.Timer timer1 = new System.Timers.Timer();
73 private string ConfigDll = "SimConfig.dll"; 73 private string ConfigDll = "SimConfig.dll";
74 private string _physicsEngine = ""; 74 private string _physicsEngine = "PhysX";
75 public bool sandbox = false; 75 public bool sandbox = false;
76 public bool loginserver = false; 76 public bool loginserver = false;
77 77
@@ -83,18 +83,13 @@ namespace OpenSim
83 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0); 83 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0);
84 84
85 sim = new OpenSim_Main(); 85 sim = new OpenSim_Main();
86 86
87 sim.sandbox = false;
88 sim.loginserver = false;
89 sim._physicsEngine = "";
90
91 for (int i = 0; i < args.Length; i++) 87 for (int i = 0; i < args.Length; i++)
92 { 88 {
93 if(args[i] == "-sandbox") 89 if(args[i] == "-sandbox")
94 { 90 {
95 sim.sandbox = true; 91 sim.sandbox = true;
96 } 92 }
97
98 if(args[i] == "-loginserver") 93 if(args[i] == "-loginserver")
99 { 94 {
100 sim.loginserver = true; 95 sim.loginserver = true;
@@ -141,6 +136,9 @@ namespace OpenSim
141 136
142 private void Startup() { 137 private void Startup() {
143 startuptime=DateTime.Now; 138 startuptime=DateTime.Now;
139 timer1.Enabled = true;
140 timer1.Interval = 100;
141 timer1.Elapsed +=new ElapsedEventHandler( this.Timer1Tick );
144 142
145 // We check our local database first, then the grid for config options 143 // We check our local database first, then the grid for config options
146 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration"); 144 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration");
@@ -152,11 +150,7 @@ namespace OpenSim
152 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString()); 150 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString());
153 ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); 151 ServerConsole.MainConsole.Instance.WriteLine("Initialising world");
154 local_world = cfg.LoadWorld(); 152 local_world = cfg.LoadWorld();
155 153
156 timer1.Enabled = true;
157 timer1.Interval = 100;
158 timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
159
160 this.physManager = new PhysicsSystem.PhysicsManager(); 154 this.physManager = new PhysicsSystem.PhysicsManager();
161 this.physManager.LoadPlugins(); 155 this.physManager.LoadPlugins();
162 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); 156 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
@@ -216,7 +210,7 @@ namespace OpenSim
216 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet); 210 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet);
217 ClientThreads.Add(epSender, newuser); 211 ClientThreads.Add(epSender, newuser);
218 } else { // invalid client 212 } else { // invalid client
219 Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); 213 Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a " + packet.ToString() + " packet from an invalid client - " + epSender.ToString());
220 } 214 }
221 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 215 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
222 } 216 }