Update svn properties. Formatting cleanup. Remove a compiler warning.

7 files changed, 54 insertions, 54 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 3129c19..da1e511 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -425,8 +425,8 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_host.AddScriptLPS(1);
             double x,y,z,s;
             int f=0;
-                        // Important Note: q1=<x,y,z,s> is equal to q2=<-x,-y,-z,-s>
-                        // Computing quaternion x,y,z,s values        
+            // Important Note: q1=<x,y,z,s> is equal to q2=<-x,-y,-z,-s>
+            // Computing quaternion x,y,z,s values        
             x = ((fwd.x - left.y - up.z + 1) / 4);
             x *= x;
             x = Math.Sqrt(Math.Sqrt(x));
@@ -440,11 +440,11 @@ namespace OpenSim.Region.ScriptEngine.Common
             s *= s;
             s = Math.Sqrt(Math.Sqrt(s));
 
-                        // Set f for signs detection         
-                if (fwd.y+left.x >= 0){f+=1;}
-                if (fwd.z+up.x >= 0){f+=2;}
-                if (left.z-up.y >= 0){f+=4;}
-                        // Set correct quaternion signs based on f value
+            // Set f for signs detection         
+            if (fwd.y+left.x >= 0){f+=1;}
+            if (fwd.z+up.x >= 0){f+=2;}
+            if (left.z-up.y >= 0){f+=4;}
+            // Set correct quaternion signs based on f value
             if (f == 0) { x = -x; }
             if (f == 1) { x = -x; y = -y; }
             if (f == 2) { x = -x; z = -z; }
@@ -459,7 +459,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             if (llVecDist(llRot2Fwd(result), fwd) > 0.001 || llVecDist(llRot2Left(result), left) > 0.001)
                 result.s = -s;
 
-                return result;
+            return result;
         }
 
         public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
@@ -950,19 +950,19 @@ namespace OpenSim.Region.ScriptEngine.Common
                 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);
                 }
@@ -1083,23 +1083,23 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             // 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;
@@ -6776,7 +6776,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 
         public LSL_Types.Vector3 llGetCameraPos()
         {
-                        m_host.AddScriptLPS(1);
+            m_host.AddScriptLPS(1);
             LLUUID invItemID=InventorySelf();
             if (invItemID == LLUUID.Zero) 
                 return new LSL_Types.Vector3();
@@ -6784,16 +6784,16 @@ namespace OpenSim.Region.ScriptEngine.Common
                return new LSL_Types.Vector3();
             if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA) == 0)
             {
-                                ShoutError("No permissions to track the camera");
+                ShoutError("No permissions to track the camera");
                 return new LSL_Types.Vector3();
             }
-                        ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
-                        if(presence != null) 
-                        {
-                                LSL_Types.Vector3 pos = new LSL_Types.Vector3(presence.CameraPosition.x,presence.CameraPosition.y,presence.CameraPosition.z);
-                                return pos;
-                        }
-                        return new LSL_Types.Vector3();
+            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+            if (presence != null) 
+            {
+                LSL_Types.Vector3 pos = new LSL_Types.Vector3(presence.CameraPosition.x,presence.CameraPosition.y,presence.CameraPosition.z);
+                return pos;
+            }
+            return new LSL_Types.Vector3();
         }
 
         public LSL_Types.Quaternion llGetCameraRot()
@@ -6968,7 +6968,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
-            if(estate == null)
+            if (estate == null)
                 return 67108864;
             return estate.GetRegionFlags();
         }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
index 537c114..ac56875 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
@@ -2108,7 +2108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.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/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<IEstateModule>();
-            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);
+    }
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9f67dc1..673189a 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1191,8 +1191,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (result == null)
                 return true;
 
-                        if(!m_InSelfDelete)
-                                result.Abort();
+            if (!m_InSelfDelete)
+                result.Abort();
 
             lock (m_EventQueue)
             {
@@ -1342,10 +1342,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                e.ToString());
                         }
                     }
-                    else if((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
+                    else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
                     {
                         m_InSelfDelete = true;
-                        if(part != null && part.ParentGroup != null)
+                        if (part != null && part.ParentGroup != null)
                             m_Engine.World.DeleteSceneObject(part.ParentGroup);
                     }
                 }