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

* Removed a bunch of compiler warnings.

0.6.0-stable
Adam Frisby 2008-03-03 09:54:39 +00:00
parent 794deeeb85
commit 415fc22e5e
11 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/ScriptServer/ScriptServerMain.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptServer
// Load DotNetEngine // Load DotNetEngine
Engine = ScriptEngines.LoadEngine("DotNetEngine"); Engine = ScriptEngines.LoadEngine("DotNetEngine");
IConfigSource config = null;
Engine.InitializeEngine(null, null, false, Engine.GetScriptManager()); Engine.InitializeEngine(null, null, false, Engine.GetScriptManager());

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

@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack
throw (ex); throw (ex);
// We are looking for alternate ports! // We are looking for alternate ports!
m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
} }
System.Threading.Thread.Sleep(100); // Wait before we retry socket System.Threading.Thread.Sleep(100); // Wait before we retry socket
} }

1
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -1255,7 +1255,6 @@ namespace OpenSim.Region.Communications.OGS1
m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
return false; return false;
} }
return false;
} }
/// <summary> /// <summary>

1
OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
View File

@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
int x, y; int x, y;
double[,] tweak = new double[map.Width, map.Height]; double[,] tweak = new double[map.Width, map.Height];
double n, l;
double area = strength; double area = strength;
double step = strength / 4.0; double step = strength / 4.0;

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

@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="RemoteClient">Client to send to</param> /// <param name="RemoteClient">Client to send to</param>
public virtual void SendLayerData(IClientAPI RemoteClient) public virtual void SendLayerData(IClientAPI RemoteClient)
{ {
bool usingTerrainModule = false; bool usingTerrainModule = true;
if (usingTerrainModule) if (usingTerrainModule)
{ {

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

@ -3494,7 +3494,6 @@ namespace OpenSim.Region.ScriptEngine.Common
int number = 0; int number = 0;
int digit; int digit;
int baddigit = 0;
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);

2
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -616,7 +616,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
list j = this; list j = this;
j.NumericSort(); j.NumericSort();
double ret;
if (Math.Ceiling(this.Length * i) == this.Length * i) if (Math.Ceiling(this.Length * i) == this.Length * i)
{ {
return (double)((double)j.Data[(int)(this.Length * i - 1)] + (double)j.Data[(int)(this.Length * i)]) / 2; return (double)((double)j.Data[(int)(this.Length * i - 1)] + (double)j.Data[(int)(this.Length * i)]) / 2;

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
View File

@ -245,7 +245,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{ {
threadClass.Stop(); threadClass.Stop();
} }
catch (Exception ex) catch (Exception)
{ {
//m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:"); //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:");
//m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString()); //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString());

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -169,7 +169,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
DoProcessQueue(); DoProcessQueue();
} }
} }
catch (ThreadAbortException tae) catch (ThreadAbortException)
{ {
if (lastScriptEngine != null) if (lastScriptEngine != null)
lastScriptEngine.Log.Info("[" + ScriptEngineName + "]: ThreadAbortException while executing function."); lastScriptEngine.Log.Info("[" + ScriptEngineName + "]: ThreadAbortException while executing function.");

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

@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
MaintenanceThreadThread.Abort(); MaintenanceThreadThread.Abort();
} }
} }
catch (Exception ex) catch (Exception)
{ {
//m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + "]: Exception stopping maintenence thread: " + ex.ToString()); //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + "]: Exception stopping maintenence thread: " + ex.ToString());
} }

2
OpenSim/Tests/Common/TestHelper.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
{ {
d(); d();
} }
catch(ArgumentException e) catch(ArgumentException)
{ {
return true; return true;
} }