From 80d8e2889e62d8900837d37a800a4eeaae5ffc5a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 23 Jul 2008 13:24:25 +0000 Subject: Update svn properties. Formatting cleanup. Remove a compiler warning. --- .../Shared/Api/Implementation/LSL_Api.cs | 26 +++++++++++----------- .../Shared/Api/Runtime/YieldProlog/YP.cs | 2 +- .../ScriptEngine/Shared/CodeTools/Compiler.cs | 2 +- .../Shared/CodeTools/ICodeConverter.cs | 8 +++---- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ac4d43a..a5c5453 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -790,19 +790,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (value == 1) { SceneObjectGroup group = m_host.ParentGroup; - if(group == null) + if (group == null) return; bool allow = true; - foreach(SceneObjectPart part in group.Children.Values) + foreach (SceneObjectPart part in group.Children.Values) { - if(part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) + if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) { allow = false; break; } } - if(!allow) + if (!allow) return; m_host.ScriptSetPhysicsStatus(true); } @@ -937,23 +937,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // TODO: this needs to trigger a persistance save as well - if(part == null || part.ParentGroup == null || part.ParentGroup.RootPart == null) + if (part == null || part.ParentGroup == null || part.ParentGroup.RootPart == null) return; - if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) + if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) { - if(scale.x > World.m_maxPhys) + if (scale.x > World.m_maxPhys) scale.x = World.m_maxPhys; - if(scale.y > World.m_maxPhys) + if (scale.y > World.m_maxPhys) scale.y = World.m_maxPhys; - if(scale.z > World.m_maxPhys) + if (scale.z > World.m_maxPhys) scale.z = World.m_maxPhys; } - if(scale.x > World.m_maxNonphys) + if (scale.x > World.m_maxNonphys) scale.x = World.m_maxNonphys; - if(scale.y > World.m_maxNonphys) + if (scale.y > World.m_maxNonphys) scale.y = World.m_maxNonphys; - if(scale.z > World.m_maxNonphys) + if (scale.z > World.m_maxNonphys) scale.z = World.m_maxNonphys; LLVector3 tmp = part.Scale; tmp.X = (float)scale.x; @@ -6748,7 +6748,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); IEstateModule estate = World.RequestModuleInterface(); - if(estate == null) + if (estate == null) return 67108864; return (int)estate.GetRegionFlags(); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs index 17f2f1c..76e307a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs @@ -2108,7 +2108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog string results = ""; for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) { - //Console.WriteLine( m ); + //Console.WriteLine( m ); results += presep+ m + postsep; } return results; diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index f7b6d08..e8cfdf7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -327,7 +327,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { // Its LSL, convert it to C# //compileScript = LSL_Converter.Convert(Script); - if(m_UseCompiler) + if (m_UseCompiler) LSL_Converter = (ICodeConverter)new CSCodeGenerator(); else LSL_Converter = (ICodeConverter)new LSL2CSConverter(); diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs index a57530c..28e42da 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/ICodeConverter.cs @@ -30,8 +30,8 @@ using System; namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { - public interface ICodeConverter - { - string Convert(string script); - } + public interface ICodeConverter + { + string Convert(string script); + } } -- cgit v1.1