* Optimized usings

* Shortened type references
* Removed redundant 'this' qualifier

OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs

@@ -26,10 +26,6 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Grid.ScriptServer
 {
     public abstract class RegionBase
@@ -73,42 +69,176 @@ namespace OpenSim.Grid.ScriptServer
         public event DefaultDelegate onobject_rez;
         public event DefaultDelegate onremote_data;
         public event DefaultDelegate onhttp_response;
-        
 
-        public void ScriptRez() { onScriptRez(); }
-        public void state_entry() { onstate_entry(); }
-        public void state_exit() { onstate_exit(); }
-        public void touch_start() { ontouch_start(); }
-        public void touch() { ontouch(); }
-        public void touch_end() { ontouch_end(); }
-        public void collision_start() { oncollision_start(); }
-        public void collision() { oncollision(); }
-        public void collision_end() { oncollision_end(); }
-        public void land_collision_start() { onland_collision_start(); }
-        public void land_collision() { onland_collision(); }
-        public void land_collision_end() { onland_collision_end(); }
-        public void timer() { ontimer(); }
-        public void listen() { onlisten(); }
-        public void on_rez() { onon_rez(); }
-        public void sensor() { onsensor(); }
-        public void no_sensor() { onno_sensor(); }
-        public void control() { oncontrol(); }
-        public void money() { onmoney(); }
-        public void email() { onemail(); }
-        public void at_target() { onat_target(); }
-        public void not_at_target() { onnot_at_target(); }
-        public void at_rot_target() { onat_rot_target(); }
-        public void not_at_rot_target() { onnot_at_rot_target(); }
-        public void run_time_permissions() { onrun_time_permissions(); }
-        public void changed() { onchanged(); }
-        public void attach() { onattach(); }
-        public void dataserver() { ondataserver(); }
-        public void link_message() { onlink_message(); }
-        public void moving_start() { onmoving_start(); }
-        public void moving_end() { onmoving_end(); }
-        public void object_rez() { onobject_rez(); }
-        public void remote_data() { onremote_data(); }
-        public void http_response() { onhttp_response(); }
- 
+
+        public void ScriptRez()
+        {
+            onScriptRez();
+        }
+
+        public void state_entry()
+        {
+            onstate_entry();
+        }
+
+        public void state_exit()
+        {
+            onstate_exit();
+        }
+
+        public void touch_start()
+        {
+            ontouch_start();
+        }
+
+        public void touch()
+        {
+            ontouch();
+        }
+
+        public void touch_end()
+        {
+            ontouch_end();
+        }
+
+        public void collision_start()
+        {
+            oncollision_start();
+        }
+
+        public void collision()
+        {
+            oncollision();
+        }
+
+        public void collision_end()
+        {
+            oncollision_end();
+        }
+
+        public void land_collision_start()
+        {
+            onland_collision_start();
+        }
+
+        public void land_collision()
+        {
+            onland_collision();
+        }
+
+        public void land_collision_end()
+        {
+            onland_collision_end();
+        }
+
+        public void timer()
+        {
+            ontimer();
+        }
+
+        public void listen()
+        {
+            onlisten();
+        }
+
+        public void on_rez()
+        {
+            onon_rez();
+        }
+
+        public void sensor()
+        {
+            onsensor();
+        }
+
+        public void no_sensor()
+        {
+            onno_sensor();
+        }
+
+        public void control()
+        {
+            oncontrol();
+        }
+
+        public void money()
+        {
+            onmoney();
+        }
+
+        public void email()
+        {
+            onemail();
+        }
+
+        public void at_target()
+        {
+            onat_target();
+        }
+
+        public void not_at_target()
+        {
+            onnot_at_target();
+        }
+
+        public void at_rot_target()
+        {
+            onat_rot_target();
+        }
+
+        public void not_at_rot_target()
+        {
+            onnot_at_rot_target();
+        }
+
+        public void run_time_permissions()
+        {
+            onrun_time_permissions();
+        }
+
+        public void changed()
+        {
+            onchanged();
+        }
+
+        public void attach()
+        {
+            onattach();
+        }
+
+        public void dataserver()
+        {
+            ondataserver();
+        }
+
+        public void link_message()
+        {
+            onlink_message();
+        }
+
+        public void moving_start()
+        {
+            onmoving_start();
+        }
+
+        public void moving_end()
+        {
+            onmoving_end();
+        }
+
+        public void object_rez()
+        {
+            onobject_rez();
+        }
+
+        public void remote_data()
+        {
+            onremote_data();
+        }
+
+        public void http_response()
+        {
+            onhttp_response();
+        }
     }
-}
+}

OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs

@@ -26,19 +26,17 @@
 * 
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Grid.ScriptServer
 {
     // Maintains connection and communication to a region
-    public class RegionConnectionManager: RegionBase
+    public class RegionConnectionManager : RegionBase
     {
-       private LogBase m_log;
+        private LogBase m_log;
         private ScriptServerMain m_ScriptServerMain;
         private object m_Connection;
+
         public RegionConnectionManager(ScriptServerMain scm, LogBase logger, object Connection)
         {
             m_ScriptServerMain = scm;
@@ -56,8 +54,6 @@ namespace OpenSim.Grid.ScriptServer
 
             // EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE
             touch_start();
-
         }
-
     }
-}
+}

OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs

@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using OpenSim.Framework.Console;
 
@@ -42,11 +40,13 @@ namespace OpenSim.Grid.ScriptServer
 
         private LogBase m_log;
         private ScriptServerMain m_ScriptServerMain;
+
         public RegionCommManager(ScriptServerMain scm, LogBase logger)
         {
             m_ScriptServerMain = scm;
             m_log = logger;
         }
+
         ~RegionCommManager()
         {
             Stop();
@@ -64,6 +64,7 @@ namespace OpenSim.Grid.ScriptServer
             listenThread.IsBackground = true;
             listenThread.Start();
         }
+
         /// <summary>
         /// Stops listening for region requests
         /// </summary>
@@ -78,7 +79,9 @@ namespace OpenSim.Grid.ScriptServer
                         listenThread.Abort();
                     listenThread.Join(1000); // Wait 1 second for thread to shut down
                 }
-                catch { }
+                catch
+                {
+                }
                 listenThread = null;
             }
         }
@@ -97,6 +100,5 @@ namespace OpenSim.Grid.ScriptServer
             // TODO: FAKING A CONNECTION
             Regions.Add(new RegionConnectionManager(m_ScriptServerMain, m_log, null));
         }
-
     }
-}
+}

OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineLoader.cs

@@ -121,5 +121,4 @@ namespace OpenSim.Grid.ScriptServer
             return ret;
         }
     }
-}
-
+}

OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs

@@ -26,9 +26,7 @@
 * 
 */
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Grid.ScriptServer
@@ -46,10 +44,11 @@ namespace OpenSim.Grid.ScriptServer
             m_ScriptServerMain = scm;
             m_log = logger;
             ScriptEngineLoader = new ScriptEngineLoader(m_log);
-            
+
             // Temp - we should not load during initialize... Loading should be done later.
             LoadEngine("DotNetScriptEngine");
         }
+
         ~ScriptEngineManager()
         {
         }
@@ -63,7 +62,5 @@ namespace OpenSim.Grid.ScriptServer
                 scriptEngines.Add(sei);
             }
         }
-
-        
     }
-}
+}