Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 15 insertions, 15 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8eebf02..9c62775 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1271,11 +1271,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return;
             if (scale.x < 0.01)
-                                scale.x = 0.01;
+                scale.x = 0.01;
             if (scale.y < 0.01)
-                                scale.y = 0.01;
+                scale.y = 0.01;
             if (scale.z < 0.01)
-                                scale.z = 0.01;
+                scale.z = 0.01;
 
             if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 549c038..41b5d49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -252,18 +252,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 m_Apis[api] = am.CreateApi(api);
                 m_Apis[api].Initialize(engine, part, m_LocalID, itemID);
-            }
+        }
 
-            try
-            {
-                    if (dom != System.AppDomain.CurrentDomain)
-                            m_Script = (IScript)dom.CreateInstanceAndUnwrap(
-                                            Path.GetFileNameWithoutExtension(assembly),
-                                            "SecondLife.Script");
-                    else
-                            m_Script = (IScript)Assembly.Load(
-                                            Path.GetFileNameWithoutExtension(assembly)).CreateInstance(
-                                            "SecondLife.Script");
+        try
+        {
+            if (dom != System.AppDomain.CurrentDomain)
+                m_Script = (IScript)dom.CreateInstanceAndUnwrap(
+                        Path.GetFileNameWithoutExtension(assembly),
+                        "SecondLife.Script");
+            else
+                m_Script = (IScript)Assembly.Load(
+                        Path.GetFileNameWithoutExtension(assembly)).CreateInstance(
+                        "SecondLife.Script");
 
 
                 //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
@@ -903,7 +903,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             // If the state is different, update the disk file.
             UUID hash = UUID.Parse(Utils.MD5String(xml));
 
-            if(hash != m_CurrentStateHash)
+            if (hash != m_CurrentStateHash)
             {
                 try
                 {