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

Update svn properties. Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-09 08:46:33 +00:00
parent 0d07cf9ddd
commit dfb63b5623
6 changed files with 166 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
OpenSim/Region/Application/OpenSim.cs
View File

@ -677,60 +677,61 @@ namespace OpenSim
return result; return result;
} }
/// <summary> /// <summary>
/// Runs the best matching plugin command /// Runs the best matching plugin command
/// ///
/// returns true if a match was found, false otherwise. /// returns true if a match was found, false otherwise.
/// </summary> /// </summary>
public bool RunPluginCommands(string cmdWithParams) public bool RunPluginCommands(string cmdWithParams)
{ {
ConsolePluginCommand bestMatch = null; ConsolePluginCommand bestMatch = null;
int bestLength = 0; int bestLength = 0;
foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos) foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
{ {
int matchLen = cmdinfo.matchLength(cmdWithParams); int matchLen = cmdinfo.matchLength(cmdWithParams);
if (matchLen > bestLength) if (matchLen > bestLength)
{ {
bestMatch = cmdinfo; bestMatch = cmdinfo;
bestLength = matchLen; bestLength = matchLen;
} }
} }
if (bestMatch == null) return false; if (bestMatch == null) return false;
bestMatch.Run(cmdWithParams.Substring(bestLength)); bestMatch.Run(cmdWithParams.Substring(bestLength));
return true; return true;
} }
/// <summary> /// <summary>
/// Show the matching plugins command help /// Show the matching plugins command help
/// </summary> /// </summary>
public void ShowPluginCommandsHelp(string cmdWithParams, ConsoleBase console) public void ShowPluginCommandsHelp(string cmdWithParams, ConsoleBase console)
{ {
foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos) foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
{ {
if (cmdinfo.IsHelpfull(cmdWithParams)) if (cmdinfo.IsHelpfull(cmdWithParams))
{ {
cmdinfo.ShowHelp(console); cmdinfo.ShowHelp(console);
} }
} }
} }
/// <summary> /// <summary>
/// Registers a new console plugin command /// Registers a new console plugin command
/// </summary> /// </summary>
public static void RegisterCmd(string cmd, ConsoleCommand deligate, string help) public static void RegisterCmd(string cmd, ConsoleCommand deligate, string help)
{ {
RegisterConsolePluginCommand(new ConsolePluginCommand(cmd, deligate, help)); RegisterConsolePluginCommand(new ConsolePluginCommand(cmd, deligate, help));
} }
/// <summary>
/// Registers a new console plugin command /// <summary>
/// </summary> /// Registers a new console plugin command
public static void RegisterConsolePluginCommand(ConsolePluginCommand pluginCommand) /// </summary>
{ public static void RegisterConsolePluginCommand(ConsolePluginCommand pluginCommand)
m_PluginCommandInfos.Add(pluginCommand); {
} m_PluginCommandInfos.Add(pluginCommand);
}
#endregion #endregion
}
}
/// <summary> /// <summary>
/// Holder object for a new console plugin command /// Holder object for a new console plugin command
/// ///

3
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -174,9 +174,10 @@ namespace OpenSim.Region.Environment.Scenes
foreach (EntityBase entity in moveEntities) foreach (EntityBase entity in moveEntities)
{ {
if(entity != null)entity.UpdateMovement();
//cfk. This throws occaisional exceptions on a heavily used region //cfk. This throws occaisional exceptions on a heavily used region
//and I added this null check to try to preclude the exception. //and I added this null check to try to preclude the exception.
if (entity != null)
entity.UpdateMovement();
} }
} }

2
OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
View File

@ -626,7 +626,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
XDetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); XDetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number);
if (d == null) if (d == null)
return new LSL_Types.LSLInteger(0); return new LSL_Types.LSLInteger(0);
if(m_host.GroupID == d.Group) if (m_host.GroupID == d.Group)
return new LSL_Types.LSLInteger(1); return new LSL_Types.LSLInteger(1);
return new LSL_Types.LSLInteger(0); return new LSL_Types.LSLInteger(0);
} }

2
OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs
View File

@ -1414,7 +1414,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
public LSLFloat(Object o) public LSLFloat(Object o)
{ {
if(!((o is double) || (o is float))) if (!((o is double) || (o is float)))
{ {
value = 0.0; value = 0.0;
return; return;

20
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -701,10 +701,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
public void Populate(Scene scene) public void Populate(Scene scene)
{ {
SceneObjectPart part = scene.GetSceneObjectPart(Key); SceneObjectPart part = scene.GetSceneObjectPart(Key);
if(part == null) // Avatar, maybe? if (part == null) // Avatar, maybe?
{ {
ScenePresence presence = scene.GetScenePresence(Key); ScenePresence presence = scene.GetScenePresence(Key);
if(presence == null) if (presence == null)
return; return;
Name = presence.Firstname + " " + presence.Lastname; Name = presence.Firstname + " " + presence.Lastname;
@ -724,7 +724,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
presence.Velocity.Z); presence.Velocity.Z);
Type = 0x01; // Avatar Type = 0x01; // Avatar
if(presence.Velocity != LLVector3.Zero) if (presence.Velocity != LLVector3.Zero)
Type |= 0x02; // Active Type |= 0x02; // Active
Group = presence.ControllingClient.ActiveGroupId; Group = presence.ControllingClient.ActiveGroupId;
@ -739,14 +739,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Group = part.GroupID; Group = part.GroupID;
Name = part.Name; Name = part.Name;
Owner = part.OwnerID; Owner = part.OwnerID;
if(part.Velocity == LLVector3.Zero) if (part.Velocity == LLVector3.Zero)
Type = 0x04; // Passive Type = 0x04; // Passive
else else
Type = 0x02; // Passive Type = 0x02; // Passive
foreach (SceneObjectPart p in part.ParentGroup.Children.Values) foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
{ {
if(part.ContainsScripts()) if (part.ContainsScripts())
{ {
Type |= 0x08; // Scripted Type |= 0x08; // Scripted
break; break;
@ -964,7 +964,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_Engine.Log.DebugFormat("[XEngine] Successfully retrieved state for script {0}.{1}", m_PrimName, m_ScriptName); m_Engine.Log.DebugFormat("[XEngine] Successfully retrieved state for script {0}.{1}", m_PrimName, m_ScriptName);
if(m_RunEvents) if (m_RunEvents)
{ {
m_RunEvents = false; m_RunEvents = false;
Start(); Start();
@ -973,7 +973,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// we get new rez events on sim restart, too // we get new rez events on sim restart, too
// but if there is state, then we fire the change // but if there is state, then we fire the change
// event // event
if(stateSource == StateSource.NewRez) if (stateSource == StateSource.NewRez)
{ {
// m_Engine.Log.Debug("[XEngine] Posted changed(CHANGED_REGION_RESTART) to script"); // m_Engine.Log.Debug("[XEngine] Posted changed(CHANGED_REGION_RESTART) to script");
PostEvent(new XEventParams("changed", PostEvent(new XEventParams("changed",
@ -1315,7 +1315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
Console.WriteLine("Unable to save xml\n"+e.ToString()); Console.WriteLine("Unable to save xml\n"+e.ToString());
} }
if(!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state"))) if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state")))
{ {
throw new Exception("Completed persistence save, but no file was created"); throw new Exception("Completed persistence save, but no file was created");
} }
@ -1328,7 +1328,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
bool running = instance.Running; bool running = instance.Running;
if(running) if (running)
instance.Stop(50); instance.Stop(50);
XmlDocument xmldoc = new XmlDocument(); XmlDocument xmldoc = new XmlDocument();
@ -1455,7 +1455,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
rootElement.AppendChild(plugins); rootElement.AppendChild(plugins);
if(running) if (running)
instance.Start(); instance.Start();
return xmldoc.InnerXml; return xmldoc.InnerXml;

202
OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs
View File

@ -1,101 +1,101 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Common;
namespace OpenSim.Region.ScriptEngine.Common.Tests namespace OpenSim.Region.ScriptEngine.Common.Tests
{ {
/// <summary> /// <summary>
/// Tests the LSL_Types.list class. /// Tests the LSL_Types.list class.
/// </summary> /// </summary>
[TestFixture] [TestFixture]
public class LSL_TypesTestList public class LSL_TypesTestList
{ {
/// <summary> /// <summary>
/// Tests concatenating a string to a list. /// Tests concatenating a string to a list.
/// </summary> /// </summary>
[Test] [Test]
public void TestConcatenateString() public void TestConcatenateString()
{ {
LSL_Types.list testList = new LSL_Types.list(1, 'a', "test"); LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
testList += "addition"; testList += "addition";
Assert.AreEqual(4, testList.Length); Assert.AreEqual(4, testList.Length);
Assert.AreEqual("addition", testList.Data[3]); Assert.AreEqual("addition", testList.Data[3]);
Assert.AreEqual(typeof(System.String), testList.Data[3].GetType()); Assert.AreEqual(typeof(System.String), testList.Data[3].GetType());
LSL_Types.list secondTestList = testList + "more"; LSL_Types.list secondTestList = testList + "more";
Assert.AreEqual(5, secondTestList.Length); Assert.AreEqual(5, secondTestList.Length);
Assert.AreEqual("more", secondTestList.Data[4]); Assert.AreEqual("more", secondTestList.Data[4]);
Assert.AreEqual(typeof(System.String), secondTestList.Data[4].GetType()); Assert.AreEqual(typeof(System.String), secondTestList.Data[4].GetType());
} }
/// <summary> /// <summary>
/// Tests concatenating an integer to a list. /// Tests concatenating an integer to a list.
/// </summary> /// </summary>
[Test] [Test]
public void TestConcatenateInteger() public void TestConcatenateInteger()
{ {
LSL_Types.list testList = new LSL_Types.list(1, 'a', "test"); LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
testList += 20; testList += 20;
Assert.AreEqual(4, testList.Length); Assert.AreEqual(4, testList.Length);
Assert.AreEqual(20, testList.Data[3]); Assert.AreEqual(20, testList.Data[3]);
Assert.AreEqual(typeof(int), testList.Data[3].GetType()); Assert.AreEqual(typeof(int), testList.Data[3].GetType());
LSL_Types.list secondTestList = testList + 2; LSL_Types.list secondTestList = testList + 2;
Assert.AreEqual(5, secondTestList.Length); Assert.AreEqual(5, secondTestList.Length);
Assert.AreEqual(2, secondTestList.Data[4]); Assert.AreEqual(2, secondTestList.Data[4]);
Assert.AreEqual(typeof(int), secondTestList.Data[4].GetType()); Assert.AreEqual(typeof(int), secondTestList.Data[4].GetType());
} }
/// <summary> /// <summary>
/// Tests concatenating an integer to a list. /// Tests concatenating an integer to a list.
/// </summary> /// </summary>
[Test] [Test]
public void TestConcatenateDouble() public void TestConcatenateDouble()
{ {
LSL_Types.list testList = new LSL_Types.list(1, 'a', "test"); LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
testList += 2.0; testList += 2.0;
Assert.AreEqual(4, testList.Length); Assert.AreEqual(4, testList.Length);
Assert.AreEqual(2.0, testList.Data[3]); Assert.AreEqual(2.0, testList.Data[3]);
Assert.AreEqual(typeof(double), testList.Data[3].GetType()); Assert.AreEqual(typeof(double), testList.Data[3].GetType());
LSL_Types.list secondTestList = testList + 0.04; LSL_Types.list secondTestList = testList + 0.04;
Assert.AreEqual(5, secondTestList.Length); Assert.AreEqual(5, secondTestList.Length);
Assert.AreEqual(0.04, secondTestList.Data[4]); Assert.AreEqual(0.04, secondTestList.Data[4]);
Assert.AreEqual(typeof(double), secondTestList.Data[4].GetType()); Assert.AreEqual(typeof(double), secondTestList.Data[4].GetType());
} }
} }
} }