From 4692e92312ceacf414629eb78f6d0725a2eb2ca5 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 14:45:56 +0000 Subject: * Assorted spring cleanings. --- OpenSim/Region/Application/OpenSimMain.cs | 5 ---- OpenSim/Region/Application/OpenSimMainConsole.cs | 32 ++++++++-------------- .../Region/ClientStack/RegionApplicationBase.cs | 2 +- .../Communications/OGS1/OGS1InventoryService.cs | 2 +- OpenSim/Region/Environment/ModuleLoader.cs | 2 +- .../Scenes/SceneCommunicationService.cs | 3 +- .../Region/Environment/Scenes/SceneObjectGroup.cs | 1 - .../Region/Environment/Scenes/SceneObjectPart.cs | 1 - OpenSim/Region/Environment/Scenes/UndoState.cs | 2 -- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 4 +-- .../Common/ScriptEngineBase/EventManager.cs | 1 - .../Common/ScriptEngineBase/MaintenanceThread.cs | 6 ++-- 12 files changed, 22 insertions(+), 39 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cad0380..e89db3d 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -26,21 +26,17 @@ */ using System; -using System.Collections; using System.Collections.Generic; using System.IO; -using System.Net; using System.Reflection; using System.Text; using System.Threading; -using System.Timers; using libsecondlife; using log4net; using Mono.Addins; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; using OpenSim.Region.ClientStack; @@ -50,7 +46,6 @@ using OpenSim.Region.Environment; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; -using Timer=System.Timers.Timer; namespace OpenSim { diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index 53e3583..ac5a1ec 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs @@ -26,33 +26,23 @@ */ using System; +using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.IO; -using System.Text; +using System.Net; +using System.Reflection; using System.Threading; using System.Timers; +using libsecondlife; +using log4net; using Nini.Config; using OpenSim.Framework; -using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; -using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; using OpenSim.Region.ClientStack; -using OpenSim.Region.Communications.Local; -using OpenSim.Region.Communications.OGS1; -using OpenSim.Region.Environment; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Physics.Manager; using Timer=System.Timers.Timer; -using System.Net; -using Nwc.XmlRpc; -using System.Collections; -using System.Reflection; -using libsecondlife; -using Mono.Addins; -using Mono.Addins.Description; namespace OpenSim { @@ -60,7 +50,7 @@ namespace OpenSim public class OpenSimMainConsole : OpenSimMain, conscmd_callback { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected string m_startupCommandsFile; protected string m_shutdownCommandsFile; @@ -243,7 +233,7 @@ namespace OpenSim } else { - m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); + m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2])); } } else @@ -300,7 +290,7 @@ namespace OpenSim // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); // } - List threads = OpenSim.Framework.ThreadTracker.GetThreads(); + List threads = ThreadTracker.GetThreads(); if (threads == null) { m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); @@ -546,7 +536,7 @@ namespace OpenSim case "unload": if (cmdparams.Length > 1) { - foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules)) + foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules)) { if (rm.Name.ToLower() == cmdparams[1].ToLower()) { @@ -559,7 +549,7 @@ namespace OpenSim case "load": if (cmdparams.Length > 1) { - foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes)) + foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) { m_console.Notice("Loading module: " + cmdparams[1]); @@ -632,7 +622,7 @@ namespace OpenSim { RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); string regionName; - System.Net.EndPoint ep = null; + EndPoint ep = null; if (regionInfo == null) { diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index d3f6f20..3643088 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -33,11 +33,11 @@ using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -//using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Region.Environment; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; +//using OpenSim.Framework.Console; namespace OpenSim.Region.ClientStack { diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index b1816d0..8a35519 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -237,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1 SynchronousRestObjectPoster.BeginPostObject( "POST", _inventoryServerUrl + "/NewItem/", item); } - catch (System.Net.WebException e) + catch (WebException e) { m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", e.Source, e.Message); diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index b34e126..e0ea94f 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs @@ -32,7 +32,6 @@ using System.Reflection; using log4net; using Nini.Config; using OpenSim.Region.Environment.Interfaces; -//TODO: Why do we reference InstantMessageModule here? using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; using OpenSim.Region.Environment.Modules.Avatar.Chat; using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; @@ -40,6 +39,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; using OpenSim.Region.Environment.Scenes; +//TODO: Why do we reference InstantMessageModule here? namespace OpenSim.Region.Environment { diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 27967bc..91bbdb7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -29,6 +29,7 @@ using System; using System.Collections.Generic; using System.Net; using System.Reflection; +using System.Threading; using libsecondlife; using log4net; using OpenSim.Framework; @@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); avatar.MakeChildAgent(); - System.Threading.Thread.Sleep(5000); + Thread.Sleep(5000); avatar.CrossAttachmentsIntoNewRegion(regionHandle); if (KillObject != null) { diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 5164d30..e53cfaa 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -30,7 +30,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Xml; -using System.Xml.Serialization; using Axiom.Math; using libsecondlife; using libsecondlife.Packets; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 5f91176..18cae48 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -26,7 +26,6 @@ */ using System; -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Runtime.Serialization; diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Environment/Scenes/UndoState.cs index 65c8669..daabd8d 100644 --- a/OpenSim/Region/Environment/Scenes/UndoState.cs +++ b/OpenSim/Region/Environment/Scenes/UndoState.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; using libsecondlife; namespace OpenSim.Region.Environment.Scenes diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 0773253..31ca3f3 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -3074,7 +3074,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return Convert.ToInt32(src.Data[index]); } - catch (System.FormatException e) + catch (FormatException e) { return 0; } @@ -3109,7 +3109,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return Convert.ToDouble(src.Data[index]); } - catch (System.FormatException e) + catch (FormatException e) { return 0.0; } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 261f862..77a4048 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -28,7 +28,6 @@ using System; using libsecondlife; using OpenSim.Framework; -using OpenSim.Region.Environment; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 458bd4c..3e9fc65 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -27,7 +27,9 @@ using System; using System.Collections; +using System.Reflection; using System.Threading; +using log4net; using OpenSim.Framework; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase @@ -38,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase public class MaintenanceThread : iScriptEngineFunctionModule { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //public ScriptEngine m_ScriptEngine; private int MaintenanceLoopms; @@ -216,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase //} } } - catch(System.Threading.ThreadAbortException ex) + catch(ThreadAbortException ex) { m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); } -- cgit v1.1