From 423d03eaefcae1bcaff8e4d16da014d350c91c42 Mon Sep 17 00:00:00 2001 From: mingchen Date: Sat, 14 Jul 2007 15:11:36 +0000 Subject: *Added support for prim counting on parcels **No restrictions yet in place, or total prim count --- OpenSim/Region/Environment/Scenes/Primitive.cs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Primitive.cs') diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index e20870f..79d5785 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs @@ -45,6 +45,8 @@ namespace OpenSim.Region.Environment.Scenes public bool m_isRootPrim; public EntityBase m_Parent; + private ParcelManager m_parcelManager; + #region Properties /// /// If rootprim, will return world position @@ -130,10 +132,12 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - public Primitive(ulong regionHandle, Scene world, LLUUID ownerID, uint localID, bool isRoot, EntityBase parent, SceneObject rootObject, PrimitiveBaseShape shape, LLVector3 pos) + public Primitive(ulong regionHandle, Scene world, ParcelManager parcelManager, LLUUID ownerID, uint localID, bool isRoot, EntityBase parent, SceneObject rootObject, PrimitiveBaseShape shape, LLVector3 pos) { + m_regionHandle = regionHandle; m_world = world; + m_parcelManager = parcelManager; inventoryItems = new Dictionary(); this.m_Parent = parent; this.m_isRootPrim = isRoot; @@ -141,6 +145,9 @@ namespace OpenSim.Region.Environment.Scenes this.CreateFromShape(ownerID, localID, pos, shape); this.Rotation = Axiom.Math.Quaternion.Identity; + + + m_parcelManager.setPrimsTainted(); } /// @@ -149,11 +156,19 @@ namespace OpenSim.Region.Environment.Scenes /// Empty constructor for duplication public Primitive() { - + m_parcelManager.setPrimsTainted(); } #endregion + #region Destructors + + ~Primitive() + { + m_parcelManager.setPrimsTainted(); + } + #endregion + #region Duplication public Primitive Copy(EntityBase parent, SceneObject rootParent) @@ -260,6 +275,8 @@ namespace OpenSim.Region.Environment.Scenes this.m_world.DeleteEntity(linkObject.rootUUID); linkObject.DeleteAllChildren(); + + m_parcelManager.setPrimsTainted(); } /// @@ -335,6 +352,7 @@ namespace OpenSim.Region.Environment.Scenes prim.m_pos += offset; prim.updateFlag = 2; } + m_parcelManager.setPrimsTainted(); } /// @@ -385,6 +403,8 @@ namespace OpenSim.Region.Environment.Scenes this.Pos = newPos; this.updateFlag = 2; + + m_parcelManager.setPrimsTainted(); } /// @@ -419,6 +439,8 @@ namespace OpenSim.Region.Environment.Scenes this.m_pos = newPos; this.updateFlag = 2; } + + m_parcelManager.setPrimsTainted(); } #endregion -- cgit v1.1