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

Fix some compiler warnings. Minor formatting cleanup.

0.6.3-post-fixes
Jeff Ames 2009-02-13 02:52:08 +00:00
parent 95d53d48d4
commit 163c1026d1
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,7 +293,7 @@ namespace OpenSim.Framework.Console
if (s == String.Empty) if (s == String.Empty)
{ {
CommandInfo ci = (CommandInfo)current[String.Empty]; CommandInfo ci = (CommandInfo)current[String.Empty];
if (ci.fn.Count != null) if (ci.fn.Count != 0)
addcr = true; addcr = true;
} }
else else
@ -355,7 +355,7 @@ namespace OpenSim.Framework.Console
if (current.ContainsKey(String.Empty)) if (current.ContainsKey(String.Empty))
{ {
CommandInfo ci = (CommandInfo)current[String.Empty]; CommandInfo ci = (CommandInfo)current[String.Empty];
if (ci.fn.Count == null) if (ci.fn.Count == 0)
return new string[0]; return new string[0];
foreach (CommandDelegate fn in ci.fn) foreach (CommandDelegate fn in ci.fn)
fn(ci.module, result); fn(ci.module, result);

1
OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
View File

@ -39,7 +39,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// </summary> /// </summary>
public class MaintenanceThread public class MaintenanceThread
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//public ScriptEngine m_ScriptEngine; //public ScriptEngine m_ScriptEngine;

4
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -505,7 +505,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
return 0; return 0;
} }
#endregion #endregion
#region Internal functions to keep track of script #region Internal functions to keep track of script
@ -591,7 +590,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
StartScript(localID, itemID, script, id.StartParam, false); StartScript(localID, itemID, script, id.StartParam, false);
} }
#region Script serialization/deserialization #region Script serialization/deserialization
public void GetSerializedScript(uint localID, UUID itemID) public void GetSerializedScript(uint localID, UUID itemID)
@ -623,9 +621,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public int GetStartParameter(UUID itemID) public int GetStartParameter(UUID itemID)
{ {
uint localID = GetLocalID(itemID); uint localID = GetLocalID(itemID);
InstanceData id = GetScript(localID, itemID); InstanceData id = GetScript(localID, itemID);
if (id == null) if (id == null)

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -361,12 +361,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llAbs(int i) public LSL_Integer llAbs(int i)
{ {
// changed to replicate LSL behaviour whereby minimum int value is returned untouched. // changed to replicate LSL behaviour whereby minimum int value is returned untouched.
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if(i == Int32.MinValue) if (i == Int32.MinValue)
return i; return i;
else else
return (int)Math.Abs(i); return (int)Math.Abs(i);
} }
public LSL_Float llFabs(double f) public LSL_Float llFabs(double f)

4
OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
public static Random random; public static Random random;
public TestClient testclient; public TestClient testclient;
TestCommunicationsManager cm; //TestCommunicationsManager cm;
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
@ -65,4 +65,4 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
xengine.PostInitialise(); xengine.PostInitialise();
} }
} }
} }

3
OpenSim/ScriptEngine/Shared/ScriptStructure.cs
View File

@ -131,6 +131,5 @@ namespace OpenSim.ScriptEngine.Shared
} }
} }
} }
} }
} }