diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs index bcf7a881c1..aa9951c1dd 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs @@ -676,4 +676,4 @@ namespace OpenSim.Framework.Communications.Capabilities } } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 53e92ae94a..4a56048cb9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -474,10 +474,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP clientCircuits_reverse.Remove(circuitcode); - lock(clientCircuits) { + lock (clientCircuits) { clientCircuits.Remove(sendto); } - lock(proxyCircuits) { + lock (proxyCircuits) { proxyCircuits.Remove(circuitcode); } } @@ -523,4 +523,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketServer.AddNewClient(userEP, useCircuit, m_assetCache, m_authenticateSessionsClass, proxyEP); } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 725efb4a55..706be06811 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Environment.Scenes void AdaptTree(ref PrimitiveBaseShape tree) { // Tree size has to be adapted depending on its type - switch((Tree)tree.State) + switch ((Tree)tree.State) { case Tree.Cypress1: case Tree.Cypress2: diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 59c54f0227..06277a1f3b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs @@ -84,11 +84,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( localID); - if(part == null) + if (part == null) return; det[0].LinkNum = 0; - if(part.ParentGroup.Children.Count > 0) + if (part.ParentGroup.Children.Count > 0) det[0].LinkNum = part.LinkNum + 1; myScriptEngine.PostObjectEvent(localID, new XEventParams( @@ -109,11 +109,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( localID); - if(part == null) + if (part == null) return; det[0].LinkNum = 0; - if(part.ParentGroup.Children.Count > 0) + if (part.ParentGroup.Children.Count > 0) det[0].LinkNum = part.LinkNum + 1; myScriptEngine.PostObjectEvent(localID, new XEventParams( @@ -130,11 +130,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( localID); - if(part == null) + if (part == null) return; det[0].LinkNum = 0; - if(part.ParentGroup.Children.Count > 0) + if (part.ParentGroup.Children.Count > 0) det[0].LinkNum = part.LinkNum + 1; myScriptEngine.PostObjectEvent(localID, new XEventParams( diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs index 1fb13a7d99..3fb0ff9322 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs @@ -661,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine { m_host.AddScriptLPS(1); XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); - if(parms == null) + if (parms == null) return new LSL_Types.Vector3(0, 0, 0); return parms.OffsetPos; @@ -688,7 +688,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine { m_host.AddScriptLPS(1); XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); - if(parms == null) + if (parms == null) return new LSL_Types.LSLInteger(0); return new LSL_Types.LSLInteger(parms.LinkNum); @@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine UserAgentData userAgent = World.CommsManager.UserService.GetAgentByUUID(id); - if(userProfile == null || userAgent == null) + if (userProfile == null || userAgent == null) return LLUUID.Zero.ToString(); string reply = String.Empty; diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs index 71fc0b6577..f43eab861c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs @@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script { Dictionary vars = new Dictionary(); - if(m_Fields == null) + if (m_Fields == null) return vars; m_Fields.Clear(); diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2848441d96..05a4f76ecf 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -395,13 +395,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_Scripts[itemID] = instance; } - if(!m_PrimObjects.ContainsKey(localID)) + if (!m_PrimObjects.ContainsKey(localID)) m_PrimObjects[localID] = new List(); - if(!m_PrimObjects[localID].Contains(itemID)) + if (!m_PrimObjects[localID].Contains(itemID)) m_PrimObjects[localID].Add(itemID); - if(!m_Assemblies.ContainsKey(assetID)) + if (!m_Assemblies.ContainsKey(assetID)) m_Assemblies[assetID] = assembly; } return true; @@ -930,14 +930,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine result = m_CurrentResult; } - if(result == null) + if (result == null) return true; result.Abort(); - if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) + if (SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) { - lock(m_EventQueue) + lock (m_EventQueue) { m_CurrentResult = null; } diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs index 4af9df75cc..29d0e1c0f1 100644 --- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testFloat = new LSL_Types.LSLFloat(number.Key); Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); @@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testFloat = new LSL_Types.LSLFloat(number.Key); Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); @@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests int testNumber; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testNumber = new LSL_Types.LSLFloat(number.Key); Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value); @@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests uint testNumber; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testNumber = new LSL_Types.LSLFloat(number.Key); Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value); @@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; bool testBool; - foreach(double number in numberList) + foreach (double number in numberList) { testFloat = new LSL_Types.LSLFloat(number); testBool = testFloat; @@ -244,7 +244,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(int number in numberList) + foreach (int number in numberList) { testFloat = number; Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); @@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testFloat = number.Key; Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); @@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(double number in numberList) + foreach (double number in numberList) { testFloat = number; Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); @@ -355,7 +355,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloatA, testFloatB; - foreach(double number in numberList) + foreach (double number in numberList) { testFloatA = new LSL_Types.LSLFloat(number); testFloatB = new LSL_Types.LSLFloat(number); @@ -396,7 +396,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloatA, testFloatB; - foreach(double number in numberList) + foreach (double number in numberList) { testFloatA = new LSL_Types.LSLFloat(number); testFloatB = new LSL_Types.LSLFloat(number + 1.0); @@ -438,7 +438,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; double testNumber; - foreach(double number in numberList) + foreach (double number in numberList) { testFloat = new LSL_Types.LSLFloat(number); @@ -484,7 +484,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; double testNumber; - foreach(double number in numberList) + foreach (double number in numberList) { testFloat = new LSL_Types.LSLFloat(number); @@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests double testNumber; LSL_Types.LSLFloat testFloat; - foreach(double number in numberList) + foreach (double number in numberList) { testFloat = new LSL_Types.LSLFloat(number); testNumber = testFloat; @@ -569,7 +569,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLFloat testFloat; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testFloat = new LSL_Types.LSLFloat(number.Key); Assert.AreEqual(number.Value, testFloat.ToString()); diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs index 83c7e770a0..0bba14c400 100644 --- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLString testString; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testString = new LSL_Types.LSLString(new LSL_Types.LSLFloat(number.Key)); Assert.AreEqual(number.Value, testString.m_string); @@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests LSL_Types.LSLString testString; - foreach(KeyValuePair number in numberSet) + foreach (KeyValuePair number in numberSet) { testString = (LSL_Types.LSLString) new LSL_Types.LSLFloat(number.Key); Assert.AreEqual(number.Value, testString.m_string);