From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../Framework/Scenes/CoalescedSceneObjects.cs | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs') 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. /// public class CoalescedSceneObjects - { + { /// /// The creator of this coalesence, though not necessarily the objects within it. /// public UUID CreatorId { get; set; } - + /// /// The number of objects in this coalesence /// @@ -54,12 +54,12 @@ namespace OpenSim.Region.Framework.Scenes return m_memberObjects.Count; } } - + /// /// Does this coalesence have any member objects? /// public bool HasObjects { get { return Count > 0; } } - + /// /// Get the objects currently in this coalescence /// @@ -70,13 +70,13 @@ namespace OpenSim.Region.Framework.Scenes lock (m_memberObjects) return new List(m_memberObjects); } - } - + } + /// /// Get the scene that contains the objects in this coalescence. If there are no objects then null is returned. /// - public Scene Scene - { + public Scene Scene + { get { if (!HasObjects) @@ -85,24 +85,24 @@ namespace OpenSim.Region.Framework.Scenes return Objects[0].Scene; } } - + /// /// 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. /// protected List m_memberObjects = new List(); - - 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); } - + /// /// Add an object to the coalescence. /// @@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes lock (m_memberObjects) m_memberObjects.Add(obj); } - + /// /// Removes a scene object from the coalescene /// @@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Scenes lock (m_memberObjects) return m_memberObjects.Remove(obj); } - + /// /// 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; } } -- cgit v1.1