diff options
author | Melanie | 2009-10-07 01:44:36 +0100 |
---|---|---|
committer | Melanie | 2009-10-07 01:44:36 +0100 |
commit | 9618c196c274fefda4437eff6d25c7a12e7a3ee1 (patch) | |
tree | b860a6f957e3d0b2504ca2ec6802b1a211e4a3de /OpenSim/Region/CoreModules/World | |
parent | Commented noisy debugging about packet splitting (diff) | |
download | opensim-SC_OLD-9618c196c274fefda4437eff6d25c7a12e7a3ee1.zip opensim-SC_OLD-9618c196c274fefda4437eff6d25c7a12e7a3ee1.tar.gz opensim-SC_OLD-9618c196c274fefda4437eff6d25c7a12e7a3ee1.tar.bz2 opensim-SC_OLD-9618c196c274fefda4437eff6d25c7a12e7a3ee1.tar.xz |
Revert "Merging in diva's locking fixes"
This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 0fed1bd..d2b5cb1 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -187,16 +187,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
187 | LandData newData = data.Copy(); | 187 | LandData newData = data.Copy(); |
188 | newData.LocalID = local_id; | 188 | newData.LocalID = local_id; |
189 | 189 | ||
190 | ILandObject land = null; | ||
191 | lock (m_landList) | 190 | lock (m_landList) |
192 | { | 191 | { |
193 | if (m_landList.ContainsKey(local_id)) | 192 | if (m_landList.ContainsKey(local_id)) |
194 | { | 193 | { |
195 | m_landList[local_id].LandData = newData; | 194 | m_landList[local_id].LandData = newData; |
196 | land = m_landList[local_id]; | 195 | m_scene.EventManager.TriggerLandObjectUpdated((uint)local_id, m_landList[local_id]); |
197 | } | 196 | } |
198 | } | 197 | } |
199 | m_scene.EventManager.TriggerLandObjectUpdated((uint)local_id, land); | ||
200 | } | 198 | } |
201 | 199 | ||
202 | public bool AllowedForcefulBans | 200 | public bool AllowedForcefulBans |
@@ -506,7 +504,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
506 | /// <param name="local_id">Land.localID of the peice of land to remove.</param> | 504 | /// <param name="local_id">Land.localID of the peice of land to remove.</param> |
507 | public void removeLandObject(int local_id) | 505 | public void removeLandObject(int local_id) |
508 | { | 506 | { |
509 | UUID id = UUID.Zero; | ||
510 | lock (m_landList) | 507 | lock (m_landList) |
511 | { | 508 | { |
512 | for (int x = 0; x < 64; x++) | 509 | for (int x = 0; x < 64; x++) |
@@ -523,10 +520,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
523 | } | 520 | } |
524 | } | 521 | } |
525 | 522 | ||
526 | id = m_landList[local_id].LandData.GlobalID; | 523 | m_scene.EventManager.TriggerLandObjectRemoved(m_landList[local_id].LandData.GlobalID); |
527 | m_landList.Remove(local_id); | 524 | m_landList.Remove(local_id); |
528 | } | 525 | } |
529 | m_scene.EventManager.TriggerLandObjectRemoved(id); | ||
530 | } | 526 | } |
531 | 527 | ||
532 | private void performFinalLandJoin(ILandObject master, ILandObject slave) | 528 | private void performFinalLandJoin(ILandObject master, ILandObject slave) |