diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 |
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 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | ||
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using log4net; | 31 | using log4net; |
33 | using log4net.Config; | 32 | using log4net.Config; |
34 | using Nini.Config; | 33 | using Nini.Config; |
35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
37 | using OpenSim.Region.Framework.Scenes; | ||
38 | 36 | ||
39 | namespace OpenSim | 37 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Xml; | ||
32 | using System.Threading; | ||
33 | using System.IO; | 29 | using System.IO; |
34 | using OpenSim.Framework; | ||
35 | using Nini; | ||
36 | using Nini.Config; | ||
37 | |||
38 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | ||
32 | using System.Xml; | ||
39 | using log4net; | 33 | using log4net; |
40 | 34 | using Nini.Config; | |
35 | using OpenSim.Framework; | ||
41 | 36 | ||
42 | namespace OpenSim | 37 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.IO; | ||
32 | using System.Net; | ||
33 | using System.Reflection; | 30 | using System.Reflection; |
34 | using System.Xml; | ||
35 | using log4net; | 31 | using log4net; |
36 | using Nini.Config; | 32 | using Nini.Config; |
37 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Console; | ||
39 | using OpenSim.Framework.Servers; | ||
40 | using OpenSim.Framework.Statistics; | ||
41 | using OpenSim.Region.ClientStack; | ||
42 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
43 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
44 | using OpenSim.Region.Communications.Local; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Region.Communications.Hypergrid; | 38 | using OpenSim.Region.Communications.Hypergrid; |
46 | using OpenSim.Region.CoreModules; | 39 | using OpenSim.Region.Communications.Local; |
47 | using OpenSim.Region.Framework; | 40 | using OpenSim.Region.Framework; |
48 | using OpenSim.Region.Framework.Interfaces; | ||
49 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
50 | using OpenSim.Region.Framework.Scenes.Hypergrid; | 42 | using OpenSim.Region.Framework.Scenes.Hypergrid; |
51 | 43 | ||
52 | using Timer = System.Timers.Timer; | ||
53 | |||
54 | namespace OpenSim | 44 | namespace 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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | ||
33 | using System.Reflection; | 32 | using System.Reflection; |
34 | using System.Runtime; | 33 | using System.Timers; |
35 | using System.Threading; | ||
36 | using OpenMetaverse; | ||
37 | using log4net; | 34 | using log4net; |
38 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenMetaverse; | ||
39 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Statistics; | 39 | using OpenSim.Framework.Statistics; |
42 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; | ||
45 | using Timer = System.Timers.Timer; | ||
46 | 42 | ||
47 | namespace OpenSim | 43 | namespace 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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.Text; | 32 | using System.Text; |
34 | using System.Threading; | ||
35 | using OpenMetaverse; | ||
36 | using log4net; | 33 | using log4net; |
37 | using Nini.Config; | 34 | using Nini.Config; |
38 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -44,7 +41,6 @@ using OpenSim.Framework.Statistics; | |||
44 | using OpenSim.Region.ClientStack; | 41 | using OpenSim.Region.ClientStack; |
45 | using OpenSim.Region.Communications.Local; | 42 | using OpenSim.Region.Communications.Local; |
46 | using OpenSim.Region.Communications.OGS1; | 43 | using OpenSim.Region.Communications.OGS1; |
47 | using OpenSim.Region.CoreModules; | ||
48 | using OpenSim.Region.Framework; | 44 | using OpenSim.Region.Framework; |
49 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
50 | using OpenSim.Region.Framework.Scenes; | 46 | using 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 |