OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Assorted spring cleanings.

0.6.0-stable
Adam Frisby 2008-05-01 14:45:56 +00:00
parent d51ce47b2d
commit 4692e92312
19 changed files with 28 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Threading;
using libsecondlife; using libsecondlife;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.SqliteClient;
@ -990,13 +991,13 @@ namespace OpenSim.Data.SQLite
m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator. Exiting now."); m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator. Exiting now.");
System.Threading.Thread.Sleep(10000); Thread.Sleep(10000);
// ICK! but it's better then A thousand red SQLITE error messages! // ICK! but it's better then A thousand red SQLITE error messages!
Environment.Exit(0); Environment.Exit(0);
} }
catch (System.Exception) catch (Exception)
{ {
// ICK! but it's better then A thousand red SQLITE error messages! // ICK! but it's better then A thousand red SQLITE error messages!
m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator"); m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator");

2
OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
View File

@ -26,9 +26,9 @@
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife;
//using System.Reflection; //using System.Reflection;
using libsecondlife;
//using log4net; //using log4net;
namespace OpenSim.Framework.Communications.Cache namespace OpenSim.Framework.Communications.Cache

1
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -29,7 +29,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using libsecondlife; using libsecondlife;
using log4net; using log4net;

3
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -26,12 +26,11 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Diagnostics; using System.Diagnostics;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions;
using log4net; using log4net;
namespace OpenSim.Framework.Console namespace OpenSim.Framework.Console

1
OpenSim/Framework/UserAppearance.cs
View File

@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework namespace OpenSim.Framework

2
OpenSim/Grid/InventoryServer/GridInventoryService.cs
View File

@ -28,8 +28,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Threading;
using libsecondlife; using libsecondlife;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;

1
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -36,6 +36,7 @@ using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
//using System.Xml; //using System.Xml;
namespace OpenSim.Grid.MessagingServer namespace OpenSim.Grid.MessagingServer

5
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -26,21 +26,17 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Timers;
using libsecondlife; using libsecondlife;
using log4net; using log4net;
using Mono.Addins; using Mono.Addins;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.ClientStack; using OpenSim.Region.ClientStack;
@ -50,7 +46,6 @@ using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using Timer=System.Timers.Timer;
namespace OpenSim namespace OpenSim
{ {

32
OpenSim/Region/Application/OpenSimMainConsole.cs
View File

@ -26,33 +26,23 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Text; using System.Net;
using System.Reflection;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using libsecondlife;
using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.ClientStack; 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.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Physics.Manager;
using Timer=System.Timers.Timer; 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 namespace OpenSim
{ {
@ -60,7 +50,7 @@ namespace OpenSim
public class OpenSimMainConsole : OpenSimMain, conscmd_callback 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_startupCommandsFile;
protected string m_shutdownCommandsFile; protected string m_shutdownCommandsFile;
@ -243,7 +233,7 @@ namespace OpenSim
} }
else 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 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()); // 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<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); List<Thread> threads = ThreadTracker.GetThreads();
if (threads == null) if (threads == null)
{ {
m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode.");
@ -546,7 +536,7 @@ namespace OpenSim
case "unload": case "unload":
if (cmdparams.Length > 1) 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()) if (rm.Name.ToLower() == cmdparams[1].ToLower())
{ {
@ -559,7 +549,7 @@ namespace OpenSim
case "load": case "load":
if (cmdparams.Length > 1) 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]); m_console.Notice("Loading module: " + cmdparams[1]);
@ -632,7 +622,7 @@ namespace OpenSim
{ {
RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
string regionName; string regionName;
System.Net.EndPoint ep = null; EndPoint ep = null;
if (regionInfo == null) if (regionInfo == null)
{ {

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -33,11 +33,11 @@ using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
//using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment; using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
//using OpenSim.Framework.Console;
namespace OpenSim.Region.ClientStack namespace OpenSim.Region.ClientStack
{ {

2
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@ -237,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
"POST", _inventoryServerUrl + "/NewItem/", item); "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}", m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
e.Source, e.Message); e.Source, e.Message);

2
OpenSim/Region/Environment/ModuleLoader.cs
View File

@ -32,7 +32,6 @@ using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
//TODO: Why do we reference InstantMessageModule here?
using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
using OpenSim.Region.Environment.Modules.Avatar.Chat; using OpenSim.Region.Environment.Modules.Avatar.Chat;
using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; 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.LoadImageURL;
using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
//TODO: Why do we reference InstantMessageModule here?
namespace OpenSim.Region.Environment namespace OpenSim.Region.Environment
{ {

3
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -29,6 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading;
using libsecondlife; using libsecondlife;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
capsPath); capsPath);
avatar.MakeChildAgent(); avatar.MakeChildAgent();
System.Threading.Thread.Sleep(5000); Thread.Sleep(5000);
avatar.CrossAttachmentsIntoNewRegion(regionHandle); avatar.CrossAttachmentsIntoNewRegion(regionHandle);
if (KillObject != null) if (KillObject != null)
{ {

1
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -30,7 +30,6 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Xml; using System.Xml;
using System.Xml.Serialization;
using Axiom.Math; using Axiom.Math;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;

1
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -26,7 +26,6 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Runtime.Serialization; using System.Runtime.Serialization;

2
OpenSim/Region/Environment/Scenes/UndoState.cs
View File

@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using System.Collections.Generic;
using libsecondlife; using libsecondlife;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes

4
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -3074,7 +3074,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
return Convert.ToInt32(src.Data[index]); return Convert.ToInt32(src.Data[index]);
} }
catch (System.FormatException e) catch (FormatException e)
{ {
return 0; return 0;
} }
@ -3109,7 +3109,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
return Convert.ToDouble(src.Data[index]); return Convert.ToDouble(src.Data[index]);
} }
catch (System.FormatException e) catch (FormatException e)
{ {
return 0.0; return 0.0;
} }

1
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
View File

@ -28,7 +28,6 @@
using System; using System;
using libsecondlife; using libsecondlife;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;

6
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
View File

@ -27,7 +27,9 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Reflection;
using System.Threading; using System.Threading;
using log4net;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
@ -38,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
public class MaintenanceThread : iScriptEngineFunctionModule 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; //public ScriptEngine m_ScriptEngine;
private int MaintenanceLoopms; 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"); m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore");
} }