aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs13
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs16
-rw-r--r--OpenSim/Region/Application/OpenSim.cs8
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
5 files changed, 10 insertions, 35 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0195bfa..b8fa786 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -27,14 +27,12 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
34using Nini.Config; 33using Nini.Config;
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
37using OpenSim.Region.Framework.Scenes;
38 36
39namespace OpenSim 37namespace OpenSim
40{ 38{
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3492a19..228c0aa 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -26,18 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml;
32using System.Threading;
33using System.IO; 29using System.IO;
34using OpenSim.Framework;
35using Nini;
36using Nini.Config;
37
38using System.Reflection; 30using System.Reflection;
31using System.Threading;
32using System.Xml;
39using log4net; 33using log4net;
40 34using Nini.Config;
35using OpenSim.Framework;
41 36
42namespace OpenSim 37namespace OpenSim
43{ 38{
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 03e22ca..7d4a39c 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -26,31 +26,21 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using System.Net;
33using System.Reflection; 30using System.Reflection;
34using System.Xml;
35using log4net; 31using log4net;
36using Nini.Config; 32using Nini.Config;
37using OpenSim.Framework; 33using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics;
41using OpenSim.Region.ClientStack;
42using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
44using OpenSim.Region.Communications.Local; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers;
45using OpenSim.Region.Communications.Hypergrid; 38using OpenSim.Region.Communications.Hypergrid;
46using OpenSim.Region.CoreModules; 39using OpenSim.Region.Communications.Local;
47using OpenSim.Region.Framework; 40using OpenSim.Region.Framework;
48using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
50using OpenSim.Region.Framework.Scenes.Hypergrid; 42using OpenSim.Region.Framework.Scenes.Hypergrid;
51 43
52using Timer = System.Timers.Timer;
53
54namespace OpenSim 44namespace OpenSim
55{ 45{
56 public class HGOpenSimNode : OpenSim 46 public class HGOpenSimNode : OpenSim
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index fbe3813..fdc55c7 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -29,20 +29,16 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net;
33using System.Reflection; 32using System.Reflection;
34using System.Runtime; 33using System.Timers;
35using System.Threading;
36using OpenMetaverse;
37using log4net; 34using log4net;
38using Nini.Config; 35using Nini.Config;
36using OpenMetaverse;
39using OpenSim.Framework; 37using OpenSim.Framework;
40using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
41using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
42using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
45using Timer = System.Timers.Timer;
46 42
47namespace OpenSim 43namespace OpenSim
48{ 44{
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 43cb127..f4e28be 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -28,11 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection; 31using System.Reflection;
33using System.Text; 32using System.Text;
34using System.Threading;
35using OpenMetaverse;
36using log4net; 33using log4net;
37using Nini.Config; 34using Nini.Config;
38using OpenSim.Framework; 35using OpenSim.Framework;
@@ -44,7 +41,6 @@ using OpenSim.Framework.Statistics;
44using OpenSim.Region.ClientStack; 41using OpenSim.Region.ClientStack;
45using OpenSim.Region.Communications.Local; 42using OpenSim.Region.Communications.Local;
46using OpenSim.Region.Communications.OGS1; 43using OpenSim.Region.Communications.OGS1;
47using OpenSim.Region.CoreModules;
48using OpenSim.Region.Framework; 44using OpenSim.Region.Framework;
49using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
50using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
@@ -446,7 +442,7 @@ namespace OpenSim
446 442
447 // Carrying on now causes a lot of confusion down the 443 // Carrying on now causes a lot of confusion down the
448 // line - we need to get the user's attention 444 // line - we need to get the user's attention
449 System.Environment.Exit(1); 445 Environment.Exit(1);
450 } 446 }
451 447
452 // We need to do this after we've initialized the 448 // We need to do this after we've initialized the