aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authormingchen2008-06-07 17:48:45 +0000
committermingchen2008-06-07 17:48:45 +0000
commitcde42cdbfd6744aca4468b0b09cccb4becaf200e (patch)
tree59ba5f0f1a206d74f1ab2724f6daeec0bf747ef5 /OpenSim/Region/Environment/Modules
parentPatch for mantis#1493: Several patches to xengine. Thanks Melanie! (diff)
downloadopensim-SC_OLD-cde42cdbfd6744aca4468b0b09cccb4becaf200e.zip
opensim-SC_OLD-cde42cdbfd6744aca4468b0b09cccb4becaf200e.tar.gz
opensim-SC_OLD-cde42cdbfd6744aca4468b0b09cccb4becaf200e.tar.bz2
opensim-SC_OLD-cde42cdbfd6744aca4468b0b09cccb4becaf200e.tar.xz
Potential Fix #1 for 0001392: Shift+Drag now causes an unhandled 'Object reference not set to an instance of object' exception
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 29e3143..1c04796 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -583,11 +583,17 @@ namespace OpenSim.Region.Environment.Modules.World.Land
583 public void UpdateLandPrimCounts() 583 public void UpdateLandPrimCounts()
584 { 584 {
585 ResetAllLandPrimCounts(); 585 ResetAllLandPrimCounts();
586 foreach (EntityBase obj in m_scene.Entities.Values) 586 lock (m_scene.Entities)
587 { 587 {
588 if (obj is SceneObjectGroup) 588 foreach (EntityBase obj in m_scene.Entities.Values)
589 { 589 {
590 m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj); 590 if (obj != null)
591 {
592 if (obj is SceneObjectGroup)
593 {
594 m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
595 }
596 }
591 } 597 }
592 } 598 }
593 FinalizeLandPrimCountUpdate(); 599 FinalizeLandPrimCountUpdate();