Merge branch 'SledjChisl'

1 files changed, 20 insertions, 20 deletions

diff --git a/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
index af8ccda..8831764 100644
--- a/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
+++ b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
@@ -37,12 +37,12 @@ namespace OpenSim.Region.Framework.Scenes
     /// are grouped together.
     /// </summary>
     public class CoalescedSceneObjects
-    {   
+    {
         /// <summary>
         /// The creator of this coalesence, though not necessarily the objects within it.
         /// </summary>
         public UUID CreatorId { get; set; }
-        
+
         /// <summary>
         /// The number of objects in this coalesence
         /// </summary>
@@ -54,12 +54,12 @@ namespace OpenSim.Region.Framework.Scenes
                     return m_memberObjects.Count;
             }
         }
-        
+
         /// <summary>
         /// Does this coalesence have any member objects?
         /// </summary>
         public bool HasObjects { get { return Count > 0; } }
-        
+
         /// <summary>
         /// Get the objects currently in this coalescence
         /// </summary>
@@ -70,13 +70,13 @@ namespace OpenSim.Region.Framework.Scenes
                 lock (m_memberObjects)
                     return new List<SceneObjectGroup>(m_memberObjects);
             }
-        }               
-        
+        }
+
         /// <summary>
         /// Get the scene that contains the objects in this coalescence.  If there are no objects then null is returned.
         /// </summary>
-        public Scene Scene 
-        { 
+        public Scene Scene
+        {
             get
             {
                 if (!HasObjects)
@@ -85,24 +85,24 @@ namespace OpenSim.Region.Framework.Scenes
                     return Objects[0].Scene;
             }
         }
-        
+
         /// <summary>
         /// At this point, we need to preserve the order of objects added to the coalescence, since the first
         /// one will end up matching the item name when rerezzed.
         /// </summary>
         protected List<SceneObjectGroup> m_memberObjects = new List<SceneObjectGroup>();
-        
-        public CoalescedSceneObjects(UUID creatorId) 
+
+        public CoalescedSceneObjects(UUID creatorId)
         {
             CreatorId = creatorId;
         }
-        
+
         public CoalescedSceneObjects(UUID creatorId, params SceneObjectGroup[] objs) : this(creatorId)
-        {            
+        {
             foreach (SceneObjectGroup obj in objs)
                 Add(obj);
         }
-            
+
         /// <summary>
         /// Add an object to the coalescence.
         /// </summary>
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_memberObjects)
                 m_memberObjects.Add(obj);
         }
-        
+
         /// <summary>
         /// Removes a scene object from the coalescene
         /// </summary>
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
             lock (m_memberObjects)
                 return m_memberObjects.Remove(obj);
         }
-        
+
         /// <summary>
         /// Get the total size of the coalescence (the size required to cover all the objects within it) and the
         /// offsets of each of those objects.
@@ -138,16 +138,16 @@ namespace OpenSim.Region.Framework.Scenes
             float minX, minY, minZ;
             float maxX, maxY, maxZ;
 
-            Vector3[] offsets 
+            Vector3[] offsets
                 = Scene.GetCombinedBoundingBox(
                     Objects, out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
-            
+
             float sizeX = maxX - minX;
             float sizeY = maxY - minY;
             float sizeZ = maxZ - minZ;
-            
+
             size = new Vector3(sizeX, sizeY, sizeZ);
-            
+
             return offsets;
         }
     }