diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneEvents.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 4df5b10..809507c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs | |||
@@ -29,7 +29,6 @@ using libsecondlife; | |||
29 | using System; | 29 | using System; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
32 | using OpenSim.Region.Environment.LandManagement; | ||
33 | 32 | ||
34 | namespace OpenSim.Region.Environment.Scenes | 33 | namespace OpenSim.Region.Environment.Scenes |
35 | { | 34 | { |
@@ -106,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
106 | 105 | ||
107 | public event SceneGroupGrabed OnSceneGroupGrab; | 106 | public event SceneGroupGrabed OnSceneGroupGrab; |
108 | 107 | ||
109 | public delegate void LandObjectAdded(Land newParcel, LLUUID regionUUID); | 108 | public delegate void LandObjectAdded(ILandObject newParcel); |
110 | 109 | ||
111 | public event LandObjectAdded OnLandObjectAdded; | 110 | public event LandObjectAdded OnLandObjectAdded; |
112 | 111 | ||
@@ -352,13 +351,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
352 | } | 351 | } |
353 | } | 352 | } |
354 | 353 | ||
355 | public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) | 354 | public void TriggerLandObjectAdded(ILandObject newParcel) |
356 | { | 355 | { |
357 | handlerLandObjectAdded = OnLandObjectAdded; | 356 | handlerLandObjectAdded = OnLandObjectAdded; |
358 | 357 | ||
359 | if (handlerLandObjectAdded != null) | 358 | if (handlerLandObjectAdded != null) |
360 | { | 359 | { |
361 | handlerLandObjectAdded(newParcel, regionID); | 360 | handlerLandObjectAdded(newParcel); |
362 | } | 361 | } |
363 | } | 362 | } |
364 | 363 | ||
@@ -371,11 +370,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
371 | } | 370 | } |
372 | } | 371 | } |
373 | 372 | ||
374 | public void TriggerLandObjectUpdated(uint localParcelID, Land newParcel) | 373 | public void TriggerLandObjectUpdated(uint localParcelID, ILandObject newParcel) |
375 | { | 374 | { |
376 | //triggerLandObjectRemoved(localParcelID); | 375 | //triggerLandObjectRemoved(localParcelID); |
377 | 376 | ||
378 | TriggerLandObjectAdded(newParcel, newParcel.m_scene.RegionInfo.RegionID); | 377 | TriggerLandObjectAdded(newParcel); |
379 | } | 378 | } |
380 | 379 | ||
381 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) | 380 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) |