* Optimised using statements and namespace references across entire project (this took a while to run).

4 files changed, 19 insertions, 20 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index e3013c9..fc38ef2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -30,10 +30,10 @@ using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
 using Microsoft.CSharp;
-using Microsoft.VisualBasic;
 using Microsoft.JScript;
+using Microsoft.VisualBasic;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 {
@@ -62,8 +62,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         private bool WriteScriptSourceToDebugFile;
         private bool CompileWithDebugInformation;
         private bool CleanUpOldScriptsOnStartup;
-        private System.Collections.Generic.Dictionary<string, Boolean> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
-        private System.Collections.Generic.Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase);
+        private Dictionary<string, bool> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
+        private Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase);
 
         private string FilePrefix;
         private string ScriptEnginesPath = "ScriptEngines";
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             if (enableCommanderLSL == true && l == enumCompileType.cs)
             {
                 foreach (KeyValuePair<string, 
-                    OpenSim.Region.Environment.Interfaces.ICommander> com 
+                    ICommander> com 
                     in m_scriptEngine.World.GetCommanders())
                 {
                     compileScript = com.Value.GenerateRuntimeAPI() + compileScript;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 20c108d..0025b26 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -26,9 +26,9 @@
 * 
 */
 
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System;
 
 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 {
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public string Convert(string Script)
         {
             quotes.Clear();
-            string Return = System.String.Empty;
+            string Return = String.Empty;
             Script = " \r\n" + Script;
 
             //
@@ -77,12 +77,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             // temporarily replace quotes so we can work our magic on the script without
             //  always considering if we are inside our outside quotes's
             // TODO: Does this work on half-quotes in strings? ;)
-            string _Script = System.String.Empty;
+            string _Script = String.Empty;
             string C;
             bool in_quote = false;
             bool quote_replaced = false;
             string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
-            string quote = System.String.Empty;
+            string quote = String.Empty;
             bool last_was_escape = false;
             int quote_replaced_count = 0;
             for (int p = 0; p < Script.Length; p++)
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                         }
                         else
                         {
-                            if (quote == System.String.Empty)
+                            if (quote == String.Empty)
                             {
                                 // We didn't replace quote, probably because of empty string?
                                 _Script += quote_replacement_string +
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                             quotes.Add(
                                 quote_replacement_string +
                                 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
-                            quote = System.String.Empty;
+                            quote = String.Empty;
                         }
                         break;
                     }
@@ -155,10 +155,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             //
             int ilevel = 0;
             int lastlevel = 0;
-            string ret = System.String.Empty;
-            string cache = System.String.Empty;
+            string ret = String.Empty;
+            string cache = String.Empty;
             bool in_state = false;
-            string current_statename = System.String.Empty;
+            string current_statename = String.Empty;
             for (int p = 0; p < Script.Length; p++)
             {
                 C = Script.Substring(p, 1);
@@ -319,9 +319,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                 {
                     state_events.Add(statea, convertnametoFlag(eventa));
                 }
-                System.Console.WriteLine("State:" + statea + ", event: " + eventa);
+                Console.WriteLine("State:" + statea + ", event: " + eventa);
             }
-            System.Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0));
+            Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0));
             // Add namespace, class name and inheritance
 
             // Looking *ONLY* for state entry events
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 6f2dbad..99efed3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -28,13 +28,12 @@
 /* Original code: Tedd Hansen */
 using System;
 using Nini.Config;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.ScriptEngine.DotNetEngine
 {
     [Serializable]
-    public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine
+    public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
     {
         // We need to override a few things for our DotNetEngine
         public override void Initialise(Scene scene, IConfigSource config)
@@ -43,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             InitializeEngine(scene, config, true, GetScriptManager());
         }
 
-        public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager()
+        public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
         {
             return new ScriptManager(this);
         }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 05a2d06..e242748 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
 
 namespace OpenSim.Region.ScriptEngine.DotNetEngine
 {
-    public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager
+    public class ScriptManager : Common.ScriptEngineBase.ScriptManager
     {
         public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
             : base(scriptEngine)