aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-03-03 09:54:39 +0000
committerAdam Frisby2008-03-03 09:54:39 +0000
commit415fc22e5ea326dd104563044533d14d08612f5c (patch)
tree13345d2565757ca0358b4894c51b7c2f6e293e8b
parent* Fixed about Text in the profile in grid mode. (diff)
downloadopensim-SC_OLD-415fc22e5ea326dd104563044533d14d08612f5c.zip
opensim-SC_OLD-415fc22e5ea326dd104563044533d14d08612f5c.tar.gz
opensim-SC_OLD-415fc22e5ea326dd104563044533d14d08612f5c.tar.bz2
opensim-SC_OLD-415fc22e5ea326dd104563044533d14d08612f5c.tar.xz
* Removed a bunch of compiler warnings.
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs2
-rw-r--r--OpenSim/Tests/Common/TestHelper.cs2
11 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 75a4543..ff063f6 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptServer
67 67
68 // Load DotNetEngine 68 // Load DotNetEngine
69 Engine = ScriptEngines.LoadEngine("DotNetEngine"); 69 Engine = ScriptEngines.LoadEngine("DotNetEngine");
70 IConfigSource config = null; 70
71 Engine.InitializeEngine(null, null, false, Engine.GetScriptManager()); 71 Engine.InitializeEngine(null, null, false, Engine.GetScriptManager());
72 72
73 73
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index e3b482f..9c572cf 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack
359 throw (ex); 359 throw (ex);
360 360
361 // We are looking for alternate ports! 361 // We are looking for alternate ports!
362 m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); 362 //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
363 } 363 }
364 System.Threading.Thread.Sleep(100); // Wait before we retry socket 364 System.Threading.Thread.Sleep(100); // Wait before we retry socket
365 } 365 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 33b5f36..12c91ac 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1255,7 +1255,6 @@ namespace OpenSim.Region.Communications.OGS1
1255 m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); 1255 m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
1256 return false; 1256 return false;
1257 } 1257 }
1258 return false;
1259 } 1258 }
1260 1259
1261 /// <summary> 1260 /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
index f02a8dd..186147b 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
77 int x, y; 77 int x, y;
78 double[,] tweak = new double[map.Width, map.Height]; 78 double[,] tweak = new double[map.Width, map.Height];
79 79
80 double n, l;
81 double area = strength; 80 double area = strength;
82 double step = strength / 4.0; 81 double step = strength / 4.0;
83 82
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 2a2dea1..9ee5e0e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Scenes
112 /// <param name="RemoteClient">Client to send to</param> 112 /// <param name="RemoteClient">Client to send to</param>
113 public virtual void SendLayerData(IClientAPI RemoteClient) 113 public virtual void SendLayerData(IClientAPI RemoteClient)
114 { 114 {
115 bool usingTerrainModule = false; 115 bool usingTerrainModule = true;
116 116
117 if (usingTerrainModule) 117 if (usingTerrainModule)
118 { 118 {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 78d3a3f..32c6414 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3494,7 +3494,6 @@ namespace OpenSim.Region.ScriptEngine.Common
3494 3494
3495 int number = 0; 3495 int number = 0;
3496 int digit; 3496 int digit;
3497 int baddigit = 0;
3498 3497
3499 m_host.AddScriptLPS(1); 3498 m_host.AddScriptLPS(1);
3500 3499
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index f3e57c4..ca2136b 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -616,7 +616,7 @@ namespace OpenSim.Region.ScriptEngine.Common
616 { 616 {
617 list j = this; 617 list j = this;
618 j.NumericSort(); 618 j.NumericSort();
619 double ret; 619
620 if (Math.Ceiling(this.Length * i) == this.Length * i) 620 if (Math.Ceiling(this.Length * i) == this.Length * i)
621 { 621 {
622 return (double)((double)j.Data[(int)(this.Length * i - 1)] + (double)j.Data[(int)(this.Length * i)]) / 2; 622 return (double)((double)j.Data[(int)(this.Length * i - 1)] + (double)j.Data[(int)(this.Length * i)]) / 2;
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 825686b..c3f6168 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
245 { 245 {
246 threadClass.Stop(); 246 threadClass.Stop();
247 } 247 }
248 catch (Exception ex) 248 catch (Exception)
249 { 249 {
250 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:"); 250 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:");
251 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString()); 251 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString());
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index 3a237da..ebb4795 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
169 DoProcessQueue(); 169 DoProcessQueue();
170 } 170 }
171 } 171 }
172 catch (ThreadAbortException tae) 172 catch (ThreadAbortException)
173 { 173 {
174 if (lastScriptEngine != null) 174 if (lastScriptEngine != null)
175 lastScriptEngine.Log.Info("[" + ScriptEngineName + "]: ThreadAbortException while executing function."); 175 lastScriptEngine.Log.Info("[" + ScriptEngineName + "]: ThreadAbortException while executing function.");
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 0fcabab..78ebecd 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
116 MaintenanceThreadThread.Abort(); 116 MaintenanceThreadThread.Abort();
117 } 117 }
118 } 118 }
119 catch (Exception ex) 119 catch (Exception)
120 { 120 {
121 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + "]: Exception stopping maintenence thread: " + ex.ToString()); 121 //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + "]: Exception stopping maintenence thread: " + ex.ToString());
122 } 122 }
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs
index 1ec9e65..2c52763 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelper.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
42 { 42 {
43 d(); 43 d();
44 } 44 }
45 catch(ArgumentException e) 45 catch(ArgumentException)
46 { 46 {
47 return true; 47 return true;
48 } 48 }