diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index 5bc28f7..29e3143 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | |||
@@ -582,6 +582,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
582 | 582 | ||
583 | public void UpdateLandPrimCounts() | 583 | public void UpdateLandPrimCounts() |
584 | { | 584 | { |
585 | ResetAllLandPrimCounts(); | ||
585 | foreach (EntityBase obj in m_scene.Entities.Values) | 586 | foreach (EntityBase obj in m_scene.Entities.Values) |
586 | { | 587 | { |
587 | if (obj is SceneObjectGroup) | 588 | if (obj is SceneObjectGroup) |
@@ -589,6 +590,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
589 | m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj); | 590 | m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj); |
590 | } | 591 | } |
591 | } | 592 | } |
593 | FinalizeLandPrimCountUpdate(); | ||
594 | landPrimCountTainted = false; | ||
592 | } | 595 | } |
593 | 596 | ||
594 | public void PerformParcelPrimCountUpdate() | 597 | public void PerformParcelPrimCountUpdate() |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 1a83f60..2f4f971 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -751,12 +751,15 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
751 | landData.ownerPrims = 0; | 751 | landData.ownerPrims = 0; |
752 | landData.otherPrims = 0; | 752 | landData.otherPrims = 0; |
753 | landData.selectedPrims = 0; | 753 | landData.selectedPrims = 0; |
754 | |||
755 | |||
754 | lock (primsOverMe) | 756 | lock (primsOverMe) |
755 | primsOverMe.Clear(); | 757 | primsOverMe.Clear(); |
756 | } | 758 | } |
757 | 759 | ||
758 | public void addPrimToCount(SceneObjectGroup obj) | 760 | public void addPrimToCount(SceneObjectGroup obj) |
759 | { | 761 | { |
762 | |||
760 | LLUUID prim_owner = obj.OwnerID; | 763 | LLUUID prim_owner = obj.OwnerID; |
761 | int prim_count = obj.PrimCount; | 764 | int prim_count = obj.PrimCount; |
762 | 765 | ||