diff options
author | Jeff Ames | 2008-07-23 13:24:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-23 13:24:25 +0000 |
commit | 80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch) | |
tree | 47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Region/ScriptEngine/Shared | |
parent | get rid of some LLQuaternion == null checks. Because LLQuaternion is (diff) | |
download | opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2 opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz |
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
4 files changed, 19 insertions, 19 deletions
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 | |||
790 | if (value == 1) | 790 | if (value == 1) |
791 | { | 791 | { |
792 | SceneObjectGroup group = m_host.ParentGroup; | 792 | SceneObjectGroup group = m_host.ParentGroup; |
793 | if(group == null) | 793 | if (group == null) |
794 | return; | 794 | return; |
795 | bool allow = true; | 795 | bool allow = true; |
796 | foreach(SceneObjectPart part in group.Children.Values) | 796 | foreach (SceneObjectPart part in group.Children.Values) |
797 | { | 797 | { |
798 | if(part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) | 798 | if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) |
799 | { | 799 | { |
800 | allow = false; | 800 | allow = false; |
801 | break; | 801 | break; |
802 | } | 802 | } |
803 | } | 803 | } |
804 | 804 | ||
805 | if(!allow) | 805 | if (!allow) |
806 | return; | 806 | return; |
807 | m_host.ScriptSetPhysicsStatus(true); | 807 | m_host.ScriptSetPhysicsStatus(true); |
808 | } | 808 | } |
@@ -937,23 +937,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
937 | { | 937 | { |
938 | // TODO: this needs to trigger a persistance save as well | 938 | // TODO: this needs to trigger a persistance save as well |
939 | 939 | ||
940 | if(part == null || part.ParentGroup == null || part.ParentGroup.RootPart == null) | 940 | if (part == null || part.ParentGroup == null || part.ParentGroup.RootPart == null) |
941 | return; | 941 | return; |
942 | 942 | ||
943 | if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) | 943 | if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) |
944 | { | 944 | { |
945 | if(scale.x > World.m_maxPhys) | 945 | if (scale.x > World.m_maxPhys) |
946 | scale.x = World.m_maxPhys; | 946 | scale.x = World.m_maxPhys; |
947 | if(scale.y > World.m_maxPhys) | 947 | if (scale.y > World.m_maxPhys) |
948 | scale.y = World.m_maxPhys; | 948 | scale.y = World.m_maxPhys; |
949 | if(scale.z > World.m_maxPhys) | 949 | if (scale.z > World.m_maxPhys) |
950 | scale.z = World.m_maxPhys; | 950 | scale.z = World.m_maxPhys; |
951 | } | 951 | } |
952 | if(scale.x > World.m_maxNonphys) | 952 | if (scale.x > World.m_maxNonphys) |
953 | scale.x = World.m_maxNonphys; | 953 | scale.x = World.m_maxNonphys; |
954 | if(scale.y > World.m_maxNonphys) | 954 | if (scale.y > World.m_maxNonphys) |
955 | scale.y = World.m_maxNonphys; | 955 | scale.y = World.m_maxNonphys; |
956 | if(scale.z > World.m_maxNonphys) | 956 | if (scale.z > World.m_maxNonphys) |
957 | scale.z = World.m_maxNonphys; | 957 | scale.z = World.m_maxNonphys; |
958 | LLVector3 tmp = part.Scale; | 958 | LLVector3 tmp = part.Scale; |
959 | tmp.X = (float)scale.x; | 959 | tmp.X = (float)scale.x; |
@@ -6748,7 +6748,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6748 | { | 6748 | { |
6749 | m_host.AddScriptLPS(1); | 6749 | m_host.AddScriptLPS(1); |
6750 | IEstateModule estate = World.RequestModuleInterface<IEstateModule>(); | 6750 | IEstateModule estate = World.RequestModuleInterface<IEstateModule>(); |
6751 | if(estate == null) | 6751 | if (estate == null) |
6752 | return 67108864; | 6752 | return 67108864; |
6753 | return (int)estate.GetRegionFlags(); | 6753 | return (int)estate.GetRegionFlags(); |
6754 | } | 6754 | } |
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 | |||
2108 | string results = ""; | 2108 | string results = ""; |
2109 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) | 2109 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) |
2110 | { | 2110 | { |
2111 | //Console.WriteLine( m ); | 2111 | //Console.WriteLine( m ); |
2112 | results += presep+ m + postsep; | 2112 | results += presep+ m + postsep; |
2113 | } | 2113 | } |
2114 | return results; | 2114 | 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 | |||
327 | { | 327 | { |
328 | // Its LSL, convert it to C# | 328 | // Its LSL, convert it to C# |
329 | //compileScript = LSL_Converter.Convert(Script); | 329 | //compileScript = LSL_Converter.Convert(Script); |
330 | if(m_UseCompiler) | 330 | if (m_UseCompiler) |
331 | LSL_Converter = (ICodeConverter)new CSCodeGenerator(); | 331 | LSL_Converter = (ICodeConverter)new CSCodeGenerator(); |
332 | else | 332 | else |
333 | LSL_Converter = (ICodeConverter)new LSL2CSConverter(); | 333 | 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; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | 31 | namespace OpenSim.Region.ScriptEngine.Shared.CodeTools |
32 | { | 32 | { |
33 | public interface ICodeConverter | 33 | public interface ICodeConverter |
34 | { | 34 | { |
35 | string Convert(string script); | 35 | string Convert(string script); |
36 | } | 36 | } |
37 | } | 37 | } |