From dfb63b56230bdd3bfd897d499ce977ea9ee9891d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 9 Jun 2008 08:46:33 +0000
Subject: Update svn properties. Formatting cleanup.
---
OpenSim/Region/Application/OpenSim.cs | 105 +++++------
OpenSim/Region/Environment/Scenes/InnerScene.cs | 3 +-
.../ScriptEngine/XEngine/LSL_ScriptCommands.cs | 2 +-
.../ScriptEngine/XEngine/Script/LSL_Types.cs | 2 +-
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 20 +-
.../ScriptEngine/Common/LSL_TypesTestList.cs | 202 ++++++++++-----------
6 files changed, 168 insertions(+), 166 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a903fd8..64ea157 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -677,60 +677,61 @@ namespace OpenSim
return result;
}
- ///
- /// Runs the best matching plugin command
- ///
- /// returns true if a match was found, false otherwise.
- ///
- public bool RunPluginCommands(string cmdWithParams)
- {
- ConsolePluginCommand bestMatch = null;
- int bestLength = 0;
- foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
- {
- int matchLen = cmdinfo.matchLength(cmdWithParams);
- if (matchLen > bestLength)
- {
- bestMatch = cmdinfo;
- bestLength = matchLen;
- }
- }
- if (bestMatch == null) return false;
- bestMatch.Run(cmdWithParams.Substring(bestLength));
- return true;
- }
-
- ///
- /// Show the matching plugins command help
- ///
- public void ShowPluginCommandsHelp(string cmdWithParams, ConsoleBase console)
- {
- foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
- {
- if (cmdinfo.IsHelpfull(cmdWithParams))
- {
- cmdinfo.ShowHelp(console);
- }
- }
- }
-
- ///
- /// Registers a new console plugin command
- ///
- public static void RegisterCmd(string cmd, ConsoleCommand deligate, string help)
- {
- RegisterConsolePluginCommand(new ConsolePluginCommand(cmd, deligate, help));
- }
- ///
- /// Registers a new console plugin command
- ///
- public static void RegisterConsolePluginCommand(ConsolePluginCommand pluginCommand)
- {
- m_PluginCommandInfos.Add(pluginCommand);
- }
+ ///
+ /// Runs the best matching plugin command
+ ///
+ /// returns true if a match was found, false otherwise.
+ ///
+ public bool RunPluginCommands(string cmdWithParams)
+ {
+ ConsolePluginCommand bestMatch = null;
+ int bestLength = 0;
+ foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
+ {
+ int matchLen = cmdinfo.matchLength(cmdWithParams);
+ if (matchLen > bestLength)
+ {
+ bestMatch = cmdinfo;
+ bestLength = matchLen;
+ }
+ }
+ if (bestMatch == null) return false;
+ bestMatch.Run(cmdWithParams.Substring(bestLength));
+ return true;
+ }
+
+ ///
+ /// Show the matching plugins command help
+ ///
+ public void ShowPluginCommandsHelp(string cmdWithParams, ConsoleBase console)
+ {
+ foreach (ConsolePluginCommand cmdinfo in m_PluginCommandInfos)
+ {
+ if (cmdinfo.IsHelpfull(cmdWithParams))
+ {
+ cmdinfo.ShowHelp(console);
+ }
+ }
+ }
+
+ ///
+ /// Registers a new console plugin command
+ ///
+ public static void RegisterCmd(string cmd, ConsoleCommand deligate, string help)
+ {
+ RegisterConsolePluginCommand(new ConsolePluginCommand(cmd, deligate, help));
+ }
+
+ ///
+ /// Registers a new console plugin command
+ ///
+ public static void RegisterConsolePluginCommand(ConsolePluginCommand pluginCommand)
+ {
+ m_PluginCommandInfos.Add(pluginCommand);
+ }
#endregion
+ }
- }
///
/// Holder object for a new console plugin command
///
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index b3663b7..d7a6d5b 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -174,9 +174,10 @@ namespace OpenSim.Region.Environment.Scenes
foreach (EntityBase entity in moveEntities)
{
- if(entity != null)entity.UpdateMovement();
//cfk. This throws occaisional exceptions on a heavily used region
//and I added this null check to try to preclude the exception.
+ if (entity != null)
+ entity.UpdateMovement();
}
}
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index 46c6c33..fce00e8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
@@ -626,7 +626,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
XDetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number);
if (d == null)
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(0);
}
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs
index a325629..8bd3d73 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Script/LSL_Types.cs
@@ -1414,7 +1414,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
public LSLFloat(Object o)
{
- if(!((o is double) || (o is float)))
+ if (!((o is double) || (o is float)))
{
value = 0.0;
return;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a5da317..0b0ff3d 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -701,10 +701,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
public void Populate(Scene scene)
{
SceneObjectPart part = scene.GetSceneObjectPart(Key);
- if(part == null) // Avatar, maybe?
+ if (part == null) // Avatar, maybe?
{
ScenePresence presence = scene.GetScenePresence(Key);
- if(presence == null)
+ if (presence == null)
return;
Name = presence.Firstname + " " + presence.Lastname;
@@ -724,7 +724,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
presence.Velocity.Z);
Type = 0x01; // Avatar
- if(presence.Velocity != LLVector3.Zero)
+ if (presence.Velocity != LLVector3.Zero)
Type |= 0x02; // Active
Group = presence.ControllingClient.ActiveGroupId;
@@ -739,14 +739,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Group = part.GroupID;
Name = part.Name;
Owner = part.OwnerID;
- if(part.Velocity == LLVector3.Zero)
+ if (part.Velocity == LLVector3.Zero)
Type = 0x04; // Passive
else
Type = 0x02; // Passive
foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
{
- if(part.ContainsScripts())
+ if (part.ContainsScripts())
{
Type |= 0x08; // Scripted
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);
- if(m_RunEvents)
+ if (m_RunEvents)
{
m_RunEvents = false;
Start();
@@ -973,7 +973,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// we get new rez events on sim restart, too
// but if there is state, then we fire the change
// event
- if(stateSource == StateSource.NewRez)
+ if (stateSource == StateSource.NewRez)
{
// m_Engine.Log.Debug("[XEngine] Posted changed(CHANGED_REGION_RESTART) to script");
PostEvent(new XEventParams("changed",
@@ -1315,7 +1315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
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");
}
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
bool running = instance.Running;
- if(running)
+ if (running)
instance.Stop(50);
XmlDocument xmldoc = new XmlDocument();
@@ -1455,7 +1455,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
rootElement.AppendChild(plugins);
- if(running)
+ if (running)
instance.Start();
return xmldoc.InnerXml;
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs
index cd2dadf..df07190 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs
@@ -1,101 +1,101 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using NUnit.Framework;
-using OpenSim.Tests.Common;
-using OpenSim.Region.ScriptEngine.Common;
-
-namespace OpenSim.Region.ScriptEngine.Common.Tests
-{
- ///
- /// Tests the LSL_Types.list class.
- ///
- [TestFixture]
- public class LSL_TypesTestList
- {
- ///
- /// Tests concatenating a string to a list.
- ///
- [Test]
- public void TestConcatenateString()
- {
- LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
- testList += "addition";
-
- Assert.AreEqual(4, testList.Length);
- Assert.AreEqual("addition", testList.Data[3]);
- Assert.AreEqual(typeof(System.String), testList.Data[3].GetType());
-
- LSL_Types.list secondTestList = testList + "more";
-
- Assert.AreEqual(5, secondTestList.Length);
- Assert.AreEqual("more", secondTestList.Data[4]);
- Assert.AreEqual(typeof(System.String), secondTestList.Data[4].GetType());
- }
-
- ///
- /// Tests concatenating an integer to a list.
- ///
- [Test]
- public void TestConcatenateInteger()
- {
- LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
- testList += 20;
-
- Assert.AreEqual(4, testList.Length);
- Assert.AreEqual(20, testList.Data[3]);
- Assert.AreEqual(typeof(int), testList.Data[3].GetType());
-
- LSL_Types.list secondTestList = testList + 2;
-
- Assert.AreEqual(5, secondTestList.Length);
- Assert.AreEqual(2, secondTestList.Data[4]);
- Assert.AreEqual(typeof(int), secondTestList.Data[4].GetType());
- }
-
- ///
- /// Tests concatenating an integer to a list.
- ///
- [Test]
- public void TestConcatenateDouble()
- {
- LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
- testList += 2.0;
-
- Assert.AreEqual(4, testList.Length);
- Assert.AreEqual(2.0, testList.Data[3]);
- Assert.AreEqual(typeof(double), testList.Data[3].GetType());
-
- LSL_Types.list secondTestList = testList + 0.04;
-
- Assert.AreEqual(5, secondTestList.Length);
- Assert.AreEqual(0.04, secondTestList.Data[4]);
- Assert.AreEqual(typeof(double), secondTestList.Data[4].GetType());
- }
- }
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using OpenSim.Tests.Common;
+using OpenSim.Region.ScriptEngine.Common;
+
+namespace OpenSim.Region.ScriptEngine.Common.Tests
+{
+ ///
+ /// Tests the LSL_Types.list class.
+ ///
+ [TestFixture]
+ public class LSL_TypesTestList
+ {
+ ///
+ /// Tests concatenating a string to a list.
+ ///
+ [Test]
+ public void TestConcatenateString()
+ {
+ LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
+ testList += "addition";
+
+ Assert.AreEqual(4, testList.Length);
+ Assert.AreEqual("addition", testList.Data[3]);
+ Assert.AreEqual(typeof(System.String), testList.Data[3].GetType());
+
+ LSL_Types.list secondTestList = testList + "more";
+
+ Assert.AreEqual(5, secondTestList.Length);
+ Assert.AreEqual("more", secondTestList.Data[4]);
+ Assert.AreEqual(typeof(System.String), secondTestList.Data[4].GetType());
+ }
+
+ ///
+ /// Tests concatenating an integer to a list.
+ ///
+ [Test]
+ public void TestConcatenateInteger()
+ {
+ LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
+ testList += 20;
+
+ Assert.AreEqual(4, testList.Length);
+ Assert.AreEqual(20, testList.Data[3]);
+ Assert.AreEqual(typeof(int), testList.Data[3].GetType());
+
+ LSL_Types.list secondTestList = testList + 2;
+
+ Assert.AreEqual(5, secondTestList.Length);
+ Assert.AreEqual(2, secondTestList.Data[4]);
+ Assert.AreEqual(typeof(int), secondTestList.Data[4].GetType());
+ }
+
+ ///
+ /// Tests concatenating an integer to a list.
+ ///
+ [Test]
+ public void TestConcatenateDouble()
+ {
+ LSL_Types.list testList = new LSL_Types.list(1, 'a', "test");
+ testList += 2.0;
+
+ Assert.AreEqual(4, testList.Length);
+ Assert.AreEqual(2.0, testList.Data[3]);
+ Assert.AreEqual(typeof(double), testList.Data[3].GetType());
+
+ LSL_Types.list secondTestList = testList + 0.04;
+
+ Assert.AreEqual(5, secondTestList.Length);
+ Assert.AreEqual(0.04, secondTestList.Data[4]);
+ Assert.AreEqual(typeof(double), secondTestList.Data[4].GetType());
+ }
+ }
+}
--
cgit v1.1