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

5 files changed, 52 insertions, 50 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 399cbf6..7df70a0 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1365,7 +1365,7 @@ namespace OpenSim.Region.Environment.Scenes
             // We need to explicitly resend the newly link prim's object properties since no other actions
             // occur on link to invoke this elsewhere (such as object selection)
             parenPrim.TriggerScriptChangedEvent(Changed.LINK);
-            if(client != null)
+            if (client != null)
                 parenPrim.GetProperties(client);
             else
             {
@@ -1426,13 +1426,13 @@ namespace OpenSim.Region.Environment.Scenes
                     parenPrim.DelinkFromGroup(childPrimId, sendEvents);
                 }
 
-                if(parenPrim.Children.Count == 1)
+                if (parenPrim.Children.Count == 1)
                 {
                     // The link set has been completely torn down
                     // This is the case if you select a link set and delink
                     //
                     parenPrim.RootPart.LinkNum = 1;
-                    if(sendEvents)
+                    if (sendEvents)
                         parenPrim.TriggerScriptChangedEvent(Changed.LINK);
                 }
                 else 
@@ -1449,7 +1449,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                     // Tear down the remaining link set
                     //
-                    if(unlink_ids.Count == 2)
+                    if (unlink_ids.Count == 2)
                     {
                         DelinkObjects(unlink_ids, true);
                         return;
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             grp.DelinkFromGroup(primIds[i]);
                             delinkedSomething = true;
-                            if(!parents.Contains(grp))
+                            if (!parents.Contains(grp))
                                 parents.Add(grp);
                         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 0cf2016..5caf0f0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1693,7 +1693,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             // Finally remove the item, for reals this time.
-            if(permissionToDelete)
+            if (permissionToDelete)
                 DeleteSceneObject(objectGroup);
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ae5a3c7..7ff5024 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -88,8 +88,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// Are we applying physics to any of the prims in this scene?
         /// </summary>
         public bool m_physicalPrim;
-                public float m_maxNonphys = 65536;
-                public float m_maxPhys = 10;
+        public float m_maxNonphys = 65536;
+        public float m_maxPhys = 10;
 
         public bool m_seeIntoRegionFromNeighbor;
         public int MaxUndoCount = 5;
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             // Load region settings
             m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID);
-            if(m_storageManager.EstateDataStore != null)
+            if (m_storageManager.EstateDataStore != null)
                 m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID);
 
 
@@ -311,16 +311,16 @@ namespace OpenSim.Region.Environment.Scenes
                 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
                 + " PhysPrim:" + m_physicalPrim.ToString();
 
-                        try
-                        {
-                                IConfig startupConfig = m_config.Configs["Startup"];
-                                m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
-                                m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
-                        }
-                        catch (Exception)
-                        {
-                                m_log.Warn("Failed to load StartupConfig");
-                        }
+            try
+            {
+                IConfig startupConfig = m_config.Configs["Startup"];
+                m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
+                m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
+            }
+            catch (Exception)
+            {
+                m_log.Warn("Failed to load StartupConfig");
+            }
 
         }
 
@@ -2505,8 +2505,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="capsObjectPath"></param>
         public void AddCapsHandler(LLUUID agentId)
         {
-                        if(RegionInfo.EstateSettings.IsBanned(agentId))
-                                return;
+            if (RegionInfo.EstateSettings.IsBanned(agentId))
+                return;
             String capsObjectPath = GetCapsPath(agentId);
 
             m_log.DebugFormat(
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index c2ce9d8..87e69f7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -427,7 +427,7 @@ namespace OpenSim.Region.Environment.Scenes
                         if (reader.Name == "SceneObjectPart")
                         {
                             SceneObjectPart Part = SceneObjectPart.FromXml(reader);
-                            if(m_rootPart.LinkNum == 0)
+                            if (m_rootPart.LinkNum == 0)
                                 m_rootPart.LinkNum++;
                             AddPart(Part);
                             Part.LinkNum = m_parts.Count;
@@ -833,7 +833,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 part.LinkNum = m_parts.Count;
 
-                if(part.LinkNum == 2 && RootPart != null)
+                if (part.LinkNum == 2 && RootPart != null)
                     RootPart.LinkNum = 1;
             }
         }
@@ -1745,7 +1745,7 @@ namespace OpenSim.Region.Environment.Scenes
             linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w);
 
             linkPart.ParentID = m_rootPart.LocalId;
-            if(m_rootPart.LinkNum == 0)
+            if (m_rootPart.LinkNum == 0)
                 m_rootPart.LinkNum = 1;
 
             lock (m_parts)
@@ -1815,13 +1815,15 @@ namespace OpenSim.Region.Environment.Scenes
                     m_parts.Remove(linkPart.UUID);
                 }
 
-                if(m_parts.Count == 1 && RootPart != null) //Single prim is left
+                if (m_parts.Count == 1 && RootPart != null) //Single prim is left
                     RootPart.LinkNum = 0;
                 else
                 {
                     foreach (SceneObjectPart p in m_parts.Values)
-                        if(p.LinkNum > linkPart.LinkNum)
+                    {
+                        if (p.LinkNum > linkPart.LinkNum)
                             p.LinkNum--;
+                    }
                 }
 
                 linkPart.ParentID = 0;
@@ -1858,7 +1860,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 m_scene.AddNewSceneObject(objectGroup, true);
 
-                if(sendEvents)
+                if (sendEvents)
                     linkPart.TriggerScriptChangedEvent(Changed.LINK);
 
                 HasGroupChanged = true;
@@ -2131,11 +2133,11 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="localID"></param>
         public void Resize(LLVector3 scale, uint localID)
         {
-            if(scale.X > m_scene.m_maxNonphys)
+            if (scale.X > m_scene.m_maxNonphys)
                 scale.X = m_scene.m_maxNonphys;
-            if(scale.Y > m_scene.m_maxNonphys)
+            if (scale.Y > m_scene.m_maxNonphys)
                 scale.Y = m_scene.m_maxNonphys;
-            if(scale.Z > m_scene.m_maxNonphys)
+            if (scale.Z > m_scene.m_maxNonphys)
                 scale.Z = m_scene.m_maxNonphys;
 
             SceneObjectPart part = GetChildPart(localID);
@@ -2144,13 +2146,13 @@ namespace OpenSim.Region.Environment.Scenes
                 part.Resize(scale);
                 if (part.PhysActor != null)
                 {
-                    if(part.PhysActor.IsPhysical)
+                    if (part.PhysActor.IsPhysical)
                     {
-                        if(scale.X > m_scene.m_maxPhys)
+                        if (scale.X > m_scene.m_maxPhys)
                             scale.X = m_scene.m_maxPhys;
-                        if(scale.Y > m_scene.m_maxPhys)
+                        if (scale.Y > m_scene.m_maxPhys)
                             scale.Y = m_scene.m_maxPhys;
-                        if(scale.Z > m_scene.m_maxPhys)
+                        if (scale.Z > m_scene.m_maxPhys)
                             scale.Z = m_scene.m_maxPhys;
                     }
                     part.PhysActor.Size =
@@ -2179,19 +2181,19 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
             {
-                if(scale.X > m_scene.m_maxNonphys)
+                if (scale.X > m_scene.m_maxNonphys)
                     scale.X = m_scene.m_maxNonphys;
-                if(scale.Y > m_scene.m_maxNonphys)
+                if (scale.Y > m_scene.m_maxNonphys)
                     scale.Y = m_scene.m_maxNonphys;
-                if(scale.Z > m_scene.m_maxNonphys)
+                if (scale.Z > m_scene.m_maxNonphys)
                     scale.Z = m_scene.m_maxNonphys;
-                if(part.PhysActor != null && part.PhysActor.IsPhysical)
+                if (part.PhysActor != null && part.PhysActor.IsPhysical)
                 {
-                    if(scale.X > m_scene.m_maxPhys)
+                    if (scale.X > m_scene.m_maxPhys)
                         scale.X = m_scene.m_maxPhys;
-                    if(scale.Y > m_scene.m_maxPhys)
+                    if (scale.Y > m_scene.m_maxPhys)
                         scale.Y = m_scene.m_maxPhys;
-                    if(scale.Z > m_scene.m_maxPhys)
+                    if (scale.Z > m_scene.m_maxPhys)
                         scale.Z = m_scene.m_maxPhys;
                 }
                 float x = (scale.X / part.Scale.X);
@@ -2200,7 +2202,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 lock (m_parts)
                 {
-                    if(x > 1.0f || y > 1.0f || z > 1.0f)
+                    if (x > 1.0f || y > 1.0f || z > 1.0f)
                     {
                         foreach (SceneObjectPart obPart in m_parts.Values)
                         {
@@ -2211,9 +2213,9 @@ namespace OpenSim.Region.Environment.Scenes
                                 float f = 1.0f;
                                 float a = 1.0f;
 
-                                if(part.PhysActor != null && part.PhysActor.IsPhysical)
+                                if (part.PhysActor != null && part.PhysActor.IsPhysical)
                                 {
-                                    if(oldSize.X*x > m_scene.m_maxPhys)
+                                    if (oldSize.X*x > m_scene.m_maxPhys)
                                     {
                                         f = m_scene.m_maxPhys / oldSize.X;
                                         a = f / x;
@@ -2221,7 +2223,7 @@ namespace OpenSim.Region.Environment.Scenes
                                         y *= a;
                                         z *= a;
                                     }
-                                    if(oldSize.Y*y > m_scene.m_maxPhys)
+                                    if (oldSize.Y*y > m_scene.m_maxPhys)
                                     {
                                         f = m_scene.m_maxPhys / oldSize.Y;
                                         a = f / y;
@@ -2229,7 +2231,7 @@ namespace OpenSim.Region.Environment.Scenes
                                         y *= a;
                                         z *= a;
                                     }
-                                    if(oldSize.Z*z > m_scene.m_maxPhys)
+                                    if (oldSize.Z*z > m_scene.m_maxPhys)
                                     {
                                         f = m_scene.m_maxPhys / oldSize.Z;
                                         a = f / z;
@@ -2240,7 +2242,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 }
                                 else
                                 {
-                                    if(oldSize.X*x > m_scene.m_maxNonphys)
+                                    if (oldSize.X*x > m_scene.m_maxNonphys)
                                     {
                                         f = m_scene.m_maxNonphys / oldSize.X;
                                         a = f / x;
@@ -2248,7 +2250,7 @@ namespace OpenSim.Region.Environment.Scenes
                                         y *= a;
                                         z *= a;
                                     }
-                                    if(oldSize.Y*y > m_scene.m_maxNonphys)
+                                    if (oldSize.Y*y > m_scene.m_maxNonphys)
                                     {
                                         f = m_scene.m_maxNonphys / oldSize.Y;
                                         a = f / y;
@@ -2256,7 +2258,7 @@ namespace OpenSim.Region.Environment.Scenes
                                         y *= a;
                                         z *= a;
                                     }
-                                    if(oldSize.Z*z > m_scene.m_maxNonphys)
+                                    if (oldSize.Z*z > m_scene.m_maxNonphys)
                                     {
                                         f = m_scene.m_maxNonphys / oldSize.Z;
                                         a = f / z;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 156310b..ac7e8a2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2245,7 +2245,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void SetAvatarOnSitTarget(LLUUID avatarID)
         {
             m_sitTargetAvatar = avatarID;
-            if(ParentGroup != null)
+            if (ParentGroup != null)
                 ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
         }