Merged

1 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 454f031..2c1f207 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -677,7 +677,7 @@ namespace OpenSim.Region.Framework.Scenes
             minY = 256f;
             minZ = 8192f;
 
-            lock(m_parts)
+            lock (m_parts)
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
@@ -1005,7 +1005,7 @@ namespace OpenSim.Region.Framework.Scenes
             AbsolutePosition = detachedpos;
             m_rootPart.AttachedAvatar = UUID.Zero;
             
-            //Anakin Lohner bug #3839            
+            //Anakin Lohner bug #3839
             lock (m_parts)
             {
                 foreach (SceneObjectPart p in m_parts.Values)
@@ -1226,7 +1226,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Delete this group from its scene.  
+        /// Delete this group from its scene.
         /// </summary>
         /// 
         /// This only handles the in-world consequences of deletion (e.g. any avatars sitting on it are forcibly stood
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!m_isBackedUp)
             {
 //                m_log.DebugFormat(
-//                    "[WATER WARS]: Ignoring backup of {0} {1} since object is not marked to be backed up", Name, UUID);                
+//                    "[WATER WARS]: Ignoring backup of {0} {1} since object is not marked to be backed up", Name, UUID);
                 return;
             }
 
@@ -1395,7 +1395,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Since this is the top of the section of call stack for backing up a particular scene object, don't let
-            // any exception propogate upwards.            
+            // any exception propogate upwards.
             try
             {
                 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart
@@ -1546,7 +1546,7 @@ namespace OpenSim.Region.Framework.Scenes
                     newPart.LinkNum = part.LinkNum;
                 }
 
-                // Need to duplicate the physics actor as well            
+                // Need to duplicate the physics actor as well
                 if (part.PhysActor != null && userExposed)
                 {
                     PrimitiveBaseShape pbs = part.Shape;
@@ -1562,7 +1562,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                     part.PhysActor.LocalID = part.LocalId;
                     part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
-                }                
+                }
             }
             
             if (userExposed)
@@ -1838,7 +1838,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart newPart = null;
             
             lock (m_parts)
-            {            
+            {
                 newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
                 newPart.SetParent(this);
                 m_parts.Add(newPart.UUID, newPart);
@@ -2337,7 +2337,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if (p.LinkNum > linkPart.LinkNum)
                             p.LinkNum--;
                     }
-                }                
+                }
             }
 
             linkPart.ParentID = 0;