diff options
Diffstat (limited to 'OpenSim')
6 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs index 0aa0525..d2e3cd0 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs | |||
@@ -40,10 +40,10 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine | |||
40 | internal class ComponentLoader | 40 | internal class ComponentLoader |
41 | { | 41 | { |
42 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | private ScriptEnginePlugin scriptEnginePlugin; | 43 | //private ScriptEnginePlugin scriptEnginePlugin; |
44 | public ComponentLoader(ScriptEnginePlugin sep) | 44 | public ComponentLoader(ScriptEnginePlugin sep) |
45 | { | 45 | { |
46 | scriptEnginePlugin = sep; | 46 | //scriptEnginePlugin = sep; |
47 | } | 47 | } |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs index e2731d7..89a90ae 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs | |||
@@ -171,7 +171,7 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine | |||
171 | { | 171 | { |
172 | p.Close(); | 172 | p.Close(); |
173 | } | 173 | } |
174 | catch (Exception ex) | 174 | catch (Exception) |
175 | { | 175 | { |
176 | // TODO: Print error to console | 176 | // TODO: Print error to console |
177 | } | 177 | } |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs index d530147..e6def85 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEnginePlugin.cs | |||
@@ -46,20 +46,20 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine | |||
46 | return; | 46 | return; |
47 | // New region is being created | 47 | // New region is being created |
48 | // Create a new script engine | 48 | // Create a new script engine |
49 | try | 49 | // try |
50 | { | 50 | // { |
51 | lock (ComponentRegistry.scriptEngines) | 51 | // lock (ComponentRegistry.scriptEngines) |
52 | { | 52 | // { |
53 | scriptEngine = | 53 | // scriptEngine = |
54 | Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as | 54 | // Activator.CreateInstance(ComponentRegistry.scriptEngines[tempScriptEngineName]) as |
55 | RegionScriptEngineBase; | 55 | // RegionScriptEngineBase; |
56 | } | 56 | // } |
57 | scriptEngine.Initialize(scene, source); | 57 | // scriptEngine.Initialize(scene, source); |
58 | } | 58 | // } |
59 | catch (Exception ex) | 59 | // catch (Exception ex) |
60 | { | 60 | // { |
61 | scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString()); | 61 | // scriptEngine.m_log.Error("[ScriptEngine]: Unable to load engine \"" + tempScriptEngineName + "\": " + ex.ToString()); |
62 | } | 62 | // } |
63 | } | 63 | } |
64 | 64 | ||
65 | public void PostInitialise() | 65 | public void PostInitialise() |
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index 535ac74..f9c5565 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -145,7 +145,7 @@ namespace OpenSim.Data.Tests | |||
145 | [Test] | 145 | [Test] |
146 | public void T300_NoTerrain() | 146 | public void T300_NoTerrain() |
147 | { | 147 | { |
148 | double[,] t1 = db.LoadTerrain(region1); | 148 | db.LoadTerrain(region1); |
149 | } | 149 | } |
150 | 150 | ||
151 | [Test] | 151 | [Test] |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 5bfe8bf..bff2101 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1373 | value = int.Parse(v, System.Globalization.NumberStyles.Integer); | 1373 | value = int.Parse(v, System.Globalization.NumberStyles.Integer); |
1374 | } | 1374 | } |
1375 | } | 1375 | } |
1376 | catch (OverflowException oe) | 1376 | catch (OverflowException) |
1377 | { | 1377 | { |
1378 | value = -1; | 1378 | value = -1; |
1379 | } | 1379 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index d107d90..b8d72e0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1455,7 +1455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1455 | value = int.Parse(v, | 1455 | value = int.Parse(v, |
1456 | System.Globalization.NumberStyles.Integer); | 1456 | System.Globalization.NumberStyles.Integer); |
1457 | } | 1457 | } |
1458 | catch (OverflowException oe) | 1458 | catch (OverflowException) |
1459 | { | 1459 | { |
1460 | value = -1; | 1460 | value = -1; |
1461 | } | 1461 | } |