diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Primitive.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Primitive.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index 79d5785..833bf85 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
45 | public bool m_isRootPrim; | 45 | public bool m_isRootPrim; |
46 | public EntityBase m_Parent; | 46 | public EntityBase m_Parent; |
47 | 47 | ||
48 | private ParcelManager m_parcelManager; | 48 | private EventManager m_eventManager; |
49 | 49 | ||
50 | #region Properties | 50 | #region Properties |
51 | /// <summary> | 51 | /// <summary> |
@@ -132,12 +132,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
132 | /// <param name="isRoot"></param> | 132 | /// <param name="isRoot"></param> |
133 | /// <param name="parent"></param> | 133 | /// <param name="parent"></param> |
134 | /// <param name="rootObject"></param> | 134 | /// <param name="rootObject"></param> |
135 | public Primitive(ulong regionHandle, Scene world, ParcelManager parcelManager, LLUUID ownerID, uint localID, bool isRoot, EntityBase parent, SceneObject rootObject, PrimitiveBaseShape shape, LLVector3 pos) | 135 | public Primitive(ulong regionHandle, Scene world, EventManager eventManager, LLUUID ownerID, uint localID, bool isRoot, EntityBase parent, SceneObject rootObject, PrimitiveBaseShape shape, LLVector3 pos) |
136 | { | 136 | { |
137 | 137 | ||
138 | m_regionHandle = regionHandle; | 138 | m_regionHandle = regionHandle; |
139 | m_world = world; | 139 | m_world = world; |
140 | m_parcelManager = parcelManager; | 140 | m_eventManager = eventManager; |
141 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | 141 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); |
142 | this.m_Parent = parent; | 142 | this.m_Parent = parent; |
143 | this.m_isRootPrim = isRoot; | 143 | this.m_isRootPrim = isRoot; |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
147 | this.Rotation = Axiom.Math.Quaternion.Identity; | 147 | this.Rotation = Axiom.Math.Quaternion.Identity; |
148 | 148 | ||
149 | 149 | ||
150 | m_parcelManager.setPrimsTainted(); | 150 | m_eventManager.TriggerParcelPrimCountTainted(); |
151 | } | 151 | } |
152 | 152 | ||
153 | /// <summary> | 153 | /// <summary> |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
156 | /// <remarks>Empty constructor for duplication</remarks> | 156 | /// <remarks>Empty constructor for duplication</remarks> |
157 | public Primitive() | 157 | public Primitive() |
158 | { | 158 | { |
159 | m_parcelManager.setPrimsTainted(); | 159 | m_eventManager.TriggerParcelPrimCountTainted(); |
160 | } | 160 | } |
161 | 161 | ||
162 | #endregion | 162 | #endregion |
@@ -165,7 +165,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
165 | 165 | ||
166 | ~Primitive() | 166 | ~Primitive() |
167 | { | 167 | { |
168 | m_parcelManager.setPrimsTainted(); | 168 | m_eventManager.TriggerParcelPrimCountTainted(); |
169 | } | 169 | } |
170 | #endregion | 170 | #endregion |
171 | 171 | ||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
276 | this.m_world.DeleteEntity(linkObject.rootUUID); | 276 | this.m_world.DeleteEntity(linkObject.rootUUID); |
277 | linkObject.DeleteAllChildren(); | 277 | linkObject.DeleteAllChildren(); |
278 | 278 | ||
279 | m_parcelManager.setPrimsTainted(); | 279 | m_eventManager.TriggerParcelPrimCountTainted(); |
280 | } | 280 | } |
281 | 281 | ||
282 | /// <summary> | 282 | /// <summary> |
@@ -352,7 +352,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
352 | prim.m_pos += offset; | 352 | prim.m_pos += offset; |
353 | prim.updateFlag = 2; | 353 | prim.updateFlag = 2; |
354 | } | 354 | } |
355 | m_parcelManager.setPrimsTainted(); | 355 | m_eventManager.TriggerParcelPrimCountTainted(); |
356 | } | 356 | } |
357 | 357 | ||
358 | /// <summary> | 358 | /// <summary> |
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
404 | this.Pos = newPos; | 404 | this.Pos = newPos; |
405 | this.updateFlag = 2; | 405 | this.updateFlag = 2; |
406 | 406 | ||
407 | m_parcelManager.setPrimsTainted(); | 407 | m_eventManager.TriggerParcelPrimCountTainted(); |
408 | } | 408 | } |
409 | 409 | ||
410 | /// <summary> | 410 | /// <summary> |
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
440 | this.updateFlag = 2; | 440 | this.updateFlag = 2; |
441 | } | 441 | } |
442 | 442 | ||
443 | m_parcelManager.setPrimsTainted(); | 443 | |
444 | } | 444 | } |
445 | 445 | ||
446 | #endregion | 446 | #endregion |