diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Grid/ScriptServer | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
9 files changed, 11 insertions, 23 deletions
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs index 5cf781f..ef93f65 100644 --- a/OpenSim/Grid/ScriptServer/Application.cs +++ b/OpenSim/Grid/ScriptServer/Application.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using log4net.Config; | ||
29 | 30 | ||
30 | namespace OpenSim.Grid.ScriptServer | 31 | namespace OpenSim.Grid.ScriptServer |
31 | { | 32 | { |
@@ -35,7 +36,7 @@ namespace OpenSim.Grid.ScriptServer | |||
35 | 36 | ||
36 | private static void Main(string[] args) | 37 | private static void Main(string[] args) |
37 | { | 38 | { |
38 | log4net.Config.XmlConfigurator.Configure(); | 39 | XmlConfigurator.Configure(); |
39 | 40 | ||
40 | AppDomain.CurrentDomain.UnhandledException += | 41 | AppDomain.CurrentDomain.UnhandledException += |
41 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 42 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs index bb2ff4e..480050d 100644 --- a/OpenSim/Grid/ScriptServer/FakeScene.cs +++ b/OpenSim/Grid/ScriptServer/FakeScene.cs | |||
@@ -25,9 +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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications; | 29 | using OpenSim.Framework.Communications; |
33 | using OpenSim.Framework.Communications.Cache; | 30 | using OpenSim.Framework.Communications.Cache; |
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs index 8cdebe7..9d3065b 100644 --- a/OpenSim/Grid/ScriptServer/RemotingObject.cs +++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs | |||
@@ -26,9 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Environment.Interfaces; | ||
32 | using OpenSim.Region.ScriptEngine.Common; | 29 | using OpenSim.Region.ScriptEngine.Common; |
33 | 30 | ||
34 | namespace OpenSim.Grid.ScriptServer | 31 | namespace OpenSim.Grid.ScriptServer |
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs index 6d8cc19..7d0e334 100644 --- a/OpenSim/Grid/ScriptServer/RemotingServer.cs +++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs | |||
@@ -25,13 +25,9 @@ | |||
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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Runtime.Remoting; | 28 | using System.Runtime.Remoting; |
32 | using System.Runtime.Remoting.Channels; | 29 | using System.Runtime.Remoting.Channels; |
33 | using System.Runtime.Remoting.Channels.Tcp; | 30 | using System.Runtime.Remoting.Channels.Tcp; |
34 | using OpenSim.Region.ScriptEngine.Common; | ||
35 | 31 | ||
36 | namespace OpenSim.Grid.ScriptServer | 32 | namespace OpenSim.Grid.ScriptServer |
37 | { | 33 | { |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs index a3d014d..a9679f8 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.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 | ||
28 | using OpenSim.Framework.Console; | ||
29 | |||
30 | namespace OpenSim.Grid.ScriptServer | 28 | namespace OpenSim.Grid.ScriptServer |
31 | { | 29 | { |
32 | // Maintains connection and communication to a region | 30 | // Maintains connection and communication to a region |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs index 6cfd6bf..c87352c 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Threading; | 29 | using System.Threading; |
30 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework; |
31 | 31 | ||
32 | namespace OpenSim.Grid.ScriptServer | 32 | namespace OpenSim.Grid.ScriptServer |
33 | { | 33 | { |
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.ScriptServer | |||
61 | listenThread.Name = "ListenThread"; | 61 | listenThread.Name = "ListenThread"; |
62 | listenThread.IsBackground = true; | 62 | listenThread.IsBackground = true; |
63 | listenThread.Start(); | 63 | listenThread.Start(); |
64 | OpenSim.Framework.ThreadTracker.Add(listenThread); | 64 | ThreadTracker.Add(listenThread); |
65 | } | 65 | } |
66 | 66 | ||
67 | /// <summary> | 67 | /// <summary> |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs index 6fcf5c8..4d8c559 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs | |||
@@ -28,14 +28,14 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenSim.Framework.Console; | 31 | using log4net; |
32 | using OpenSim.Region.ScriptEngine.Common; | 32 | using OpenSim.Region.ScriptEngine.Common; |
33 | 33 | ||
34 | namespace OpenSim.Grid.ScriptServer.ScriptServer | 34 | namespace OpenSim.Grid.ScriptServer.ScriptServer |
35 | { | 35 | { |
36 | internal class ScriptEngineLoader | 36 | internal class ScriptEngineLoader |
37 | { | 37 | { |
38 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | 39 | ||
40 | public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) | 40 | public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) |
41 | { | 41 | { |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs index 2cb46dd..9d67602 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs | |||
@@ -26,7 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenSim.Framework.Console; | ||
30 | using OpenSim.Region.ScriptEngine.Common; | 29 | using OpenSim.Region.ScriptEngine.Common; |
31 | 30 | ||
32 | namespace OpenSim.Grid.ScriptServer.ScriptServer | 31 | namespace OpenSim.Grid.ScriptServer.ScriptServer |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs index 12e5f1d..729d262 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs | |||
@@ -25,10 +25,10 @@ | |||
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 | ||
28 | using System.IO; | 28 | using System; |
29 | using System.Reflection; | ||
29 | using libsecondlife; | 30 | using libsecondlife; |
30 | using Nini.Config; | 31 | using log4net; |
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
33 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
34 | using OpenSim.Grid.ScriptServer.ScriptServer; | 34 | using OpenSim.Grid.ScriptServer.ScriptServer; |
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.ScriptServer | |||
39 | { | 39 | { |
40 | public class ScriptServerMain : BaseOpenSimServer, conscmd_callback | 40 | public class ScriptServerMain : BaseOpenSimServer, conscmd_callback |
41 | { | 41 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | // | 44 | // |
45 | // Root object. Creates objects used. | 45 | // Root object. Creates objects used. |
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.ScriptServer | |||
77 | RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand); | 77 | RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand); |
78 | m_TCPServer.StartListen(); | 78 | m_TCPServer.StartListen(); |
79 | 79 | ||
80 | System.Console.ReadLine(); | 80 | Console.ReadLine(); |
81 | } | 81 | } |
82 | 82 | ||
83 | private void RPC_ReceiveCommand(int ID, string Command, object[] p) | 83 | private void RPC_ReceiveCommand(int ID, string Command, object[] p) |