aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Application
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs8
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs52
-rw-r--r--OpenSim/Region/Application/VersionInfo.cs2
3 files changed, 22 insertions, 40 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 1dcd99b..0428f5a 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -26,10 +26,8 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
32using OpenSim.Region.ClientStack; 30using OpenSim.Region.Environment.Scenes;
33 31
34namespace OpenSim 32namespace OpenSim
35{ 33{
@@ -109,13 +107,13 @@ namespace OpenSim
109 sim.m_sandbox = sandBoxMode; 107 sim.m_sandbox = sandBoxMode;
110 sim.user_accounts = userAccounts; 108 sim.user_accounts = userAccounts;
111 sim.gridLocalAsset = gridLocalAsset; 109 sim.gridLocalAsset = gridLocalAsset;
112 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying; 110 ScenePresence.PhysicsEngineFlying = allowFlying;
113 111
114 sim.StartUp(); 112 sim.StartUp();
115 113
116 while (true) 114 while (true)
117 { 115 {
118 OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt(); 116 MainLog.Instance.MainLogPrompt();
119 } 117 }
120 } 118 }
121 } 119 }
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 097d1cc..e976fe3 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -27,37 +27,23 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Text;
31using System.IO; 30using System.IO;
32using System.Threading;
33using System.Net;
34using System.Net.Sockets;
35using System.Timers;
36using System.Reflection;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife; 31using libsecondlife;
40using libsecondlife.Packets;
41using OpenSim.Region.Environment;
42using OpenSim.Region.Environment.Scenes;
43using OpenSim.Region.Terrain;
44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Data;
46
47using OpenSim.Framework.Types;
48using OpenSim.Framework;
49using OpenSim.Assets; 32using OpenSim.Assets;
50using OpenSim.Region.Caches; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
51using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
52using OpenSim.Physics.Manager; 36using OpenSim.Framework.Data;
53using Nwc.XmlRpc; 37using OpenSim.Framework.Interfaces;
54using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Types;
55using OpenSim.GenericConfig; 40using OpenSim.GenericConfig;
56using OpenSim.Framework.Communications; 41using OpenSim.Physics.Manager;
57using OpenSim.Region.Communications.OGS1; 42using OpenSim.Region.Caches;
58using OpenSim.Region.Communications.Local;
59
60using OpenSim.Region.ClientStack; 43using OpenSim.Region.ClientStack;
44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1;
46using OpenSim.Region.Environment.Scenes;
61 47
62namespace OpenSim 48namespace OpenSim
63{ 49{
@@ -96,7 +82,7 @@ namespace OpenSim
96 } 82 }
97 83
98 m_log = new LogBase(m_logFilename, "Region", this, m_silent); 84 m_log = new LogBase(m_logFilename, "Region", this, m_silent);
99 OpenSim.Framework.Console.MainLog.Instance = m_log; 85 MainLog.Instance = m_log;
100 86
101 m_log.Verbose( "Main.cs:Startup() - Loading configuration"); 87 m_log.Verbose( "Main.cs:Startup() - Loading configuration");
102 this.serversData.InitConfig(this.m_sandbox, this.localConfig); 88 this.serversData.InitConfig(this.m_sandbox, this.localConfig);
@@ -121,7 +107,7 @@ namespace OpenSim
121 107
122 startuptime = DateTime.Now; 108 startuptime = DateTime.Now;
123 109
124 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 110 this.physManager = new PhysicsManager();
125 this.physManager.LoadPlugins(); 111 this.physManager.LoadPlugins();
126 112
127 this.SetupHttpListener(); 113 this.SetupHttpListener();
@@ -187,12 +173,12 @@ namespace OpenSim
187 RegionInfo regionDat = new RegionInfo(); 173 RegionInfo regionDat = new RegionInfo();
188 AuthenticateSessionsBase authenBase; 174 AuthenticateSessionsBase authenBase;
189 175
190 string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions"); 176 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
191 string[] configFiles = Directory.GetFiles(path, "*.xml"); 177 string[] configFiles = Directory.GetFiles(path, "*.xml");
192 178
193 if (configFiles.Length == 0) 179 if (configFiles.Length == 0)
194 { 180 {
195 string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions"); 181 string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
196 string path3 = Path.Combine(path2, "default.xml"); 182 string path3 = Path.Combine(path2, "default.xml");
197 Console.WriteLine("Creating default region config file"); 183 Console.WriteLine("Creating default region config file");
198 //TODO create default region 184 //TODO create default region
@@ -361,23 +347,23 @@ namespace OpenSim
361 case "": 347 case "":
362 this.m_physicsEngine = "basicphysics"; 348 this.m_physicsEngine = "basicphysics";
363 configData.SetAttribute("PhysicsEngine", "basicphysics"); 349 configData.SetAttribute("PhysicsEngine", "basicphysics");
364 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; 350 ScenePresence.PhysicsEngineFlying = false;
365 break; 351 break;
366 352
367 case "basicphysics": 353 case "basicphysics":
368 this.m_physicsEngine = "basicphysics"; 354 this.m_physicsEngine = "basicphysics";
369 configData.SetAttribute("PhysicsEngine", "basicphysics"); 355 configData.SetAttribute("PhysicsEngine", "basicphysics");
370 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; 356 ScenePresence.PhysicsEngineFlying = false;
371 break; 357 break;
372 358
373 case "RealPhysX": 359 case "RealPhysX":
374 this.m_physicsEngine = "RealPhysX"; 360 this.m_physicsEngine = "RealPhysX";
375 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; 361 ScenePresence.PhysicsEngineFlying = true;
376 break; 362 break;
377 363
378 case "OpenDynamicsEngine": 364 case "OpenDynamicsEngine":
379 this.m_physicsEngine = "OpenDynamicsEngine"; 365 this.m_physicsEngine = "OpenDynamicsEngine";
380 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; 366 ScenePresence.PhysicsEngineFlying = true;
381 break; 367 break;
382 } 368 }
383 369
@@ -459,7 +445,7 @@ namespace OpenSim
459 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); 445 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
460 break; 446 break;
461 case "users": 447 case "users":
462 OpenSim.Region.Environment.Scenes.ScenePresence TempAv; 448 ScenePresence TempAv;
463 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); 449 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
464 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 450 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
465 { 451 {
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
index 5d1354e..2c720a3 100644
--- a/OpenSim/Region/Application/VersionInfo.cs
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -25,8 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29
30namespace OpenSim 28namespace OpenSim
31{ 29{
32 /// <summary> 30 /// <summary>