aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs4
-rw-r--r--OpenSim/ScriptEngine/Shared/ScriptStructure.cs3
6 files changed, 9 insertions, 15 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 793270b..0e7326f 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Framework.Console
293 if (s == String.Empty) 293 if (s == String.Empty)
294 { 294 {
295 CommandInfo ci = (CommandInfo)current[String.Empty]; 295 CommandInfo ci = (CommandInfo)current[String.Empty];
296 if (ci.fn.Count != null) 296 if (ci.fn.Count != 0)
297 addcr = true; 297 addcr = true;
298 } 298 }
299 else 299 else
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.Console
355 if (current.ContainsKey(String.Empty)) 355 if (current.ContainsKey(String.Empty))
356 { 356 {
357 CommandInfo ci = (CommandInfo)current[String.Empty]; 357 CommandInfo ci = (CommandInfo)current[String.Empty];
358 if (ci.fn.Count == null) 358 if (ci.fn.Count == 0)
359 return new string[0]; 359 return new string[0];
360 foreach (CommandDelegate fn in ci.fn) 360 foreach (CommandDelegate fn in ci.fn)
361 fn(ci.module, result); 361 fn(ci.module, result);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
index c0a3c4d..49e87c0 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
@@ -39,7 +39,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
39 /// </summary> 39 /// </summary>
40 public class MaintenanceThread 40 public class MaintenanceThread
41 { 41 {
42
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 43
45 //public ScriptEngine m_ScriptEngine; 44 //public ScriptEngine m_ScriptEngine;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 3de3aad..0c06630 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -505,7 +505,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
505 return 0; 505 return 0;
506 } 506 }
507 507
508
509 #endregion 508 #endregion
510 509
511 #region Internal functions to keep track of script 510 #region Internal functions to keep track of script
@@ -591,7 +590,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
591 StartScript(localID, itemID, script, id.StartParam, false); 590 StartScript(localID, itemID, script, id.StartParam, false);
592 } 591 }
593 592
594
595 #region Script serialization/deserialization 593 #region Script serialization/deserialization
596 594
597 public void GetSerializedScript(uint localID, UUID itemID) 595 public void GetSerializedScript(uint localID, UUID itemID)
@@ -623,9 +621,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
623 621
624 public int GetStartParameter(UUID itemID) 622 public int GetStartParameter(UUID itemID)
625 { 623 {
626
627 uint localID = GetLocalID(itemID); 624 uint localID = GetLocalID(itemID);
628
629 InstanceData id = GetScript(localID, itemID); 625 InstanceData id = GetScript(localID, itemID);
630 626
631 if (id == null) 627 if (id == null)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 69ac517..cd17399 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -361,12 +361,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
361 361
362 public LSL_Integer llAbs(int i) 362 public LSL_Integer llAbs(int i)
363 { 363 {
364 // changed to replicate LSL behaviour whereby minimum int value is returned untouched. 364 // changed to replicate LSL behaviour whereby minimum int value is returned untouched.
365 m_host.AddScriptLPS(1); 365 m_host.AddScriptLPS(1);
366 if(i == Int32.MinValue) 366 if (i == Int32.MinValue)
367 return i; 367 return i;
368 else 368 else
369 return (int)Math.Abs(i); 369 return (int)Math.Abs(i);
370 } 370 }
371 371
372 public LSL_Float llFabs(double f) 372 public LSL_Float llFabs(double f)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index 17d26ef..663b0ca 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
47 47
48 public static Random random; 48 public static Random random;
49 public TestClient testclient; 49 public TestClient testclient;
50 TestCommunicationsManager cm; 50 //TestCommunicationsManager cm;
51 51
52 [TestFixtureSetUp] 52 [TestFixtureSetUp]
53 public void Init() 53 public void Init()
@@ -65,4 +65,4 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
65 xengine.PostInitialise(); 65 xengine.PostInitialise();
66 } 66 }
67 } 67 }
68} \ No newline at end of file 68}
diff --git a/OpenSim/ScriptEngine/Shared/ScriptStructure.cs b/OpenSim/ScriptEngine/Shared/ScriptStructure.cs
index 8c7a972..785040c 100644
--- a/OpenSim/ScriptEngine/Shared/ScriptStructure.cs
+++ b/OpenSim/ScriptEngine/Shared/ScriptStructure.cs
@@ -131,6 +131,5 @@ namespace OpenSim.ScriptEngine.Shared
131 } 131 }
132 } 132 }
133 } 133 }
134
135 } 134 }
136} \ No newline at end of file 135}