diff options
author | Teravus Ovares | 2008-05-24 21:13:44 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-24 21:13:44 +0000 |
commit | cd79be569cf74c7bead86305caed1f9050d0db8c (patch) | |
tree | 2ab1d7b8222959615c8b845ba89d7ba0b09aa37c /OpenSim/Region/Environment/Scenes/EventManager.cs | |
parent | * Get the xml2 entities serialization representation in the archiver module (diff) | |
download | opensim-SC_OLD-cd79be569cf74c7bead86305caed1f9050d0db8c.zip opensim-SC_OLD-cd79be569cf74c7bead86305caed1f9050d0db8c.tar.gz opensim-SC_OLD-cd79be569cf74c7bead86305caed1f9050d0db8c.tar.bz2 opensim-SC_OLD-cd79be569cf74c7bead86305caed1f9050d0db8c.tar.xz |
* Fixes endless loop in the Land Module when selecting any object.
* Fixes returning objects when the object owner hasn't been in the simulator since the simulator started up last.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index 6c714f8..a3f5d2f 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -438,6 +438,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
438 | } | 438 | } |
439 | } | 439 | } |
440 | 440 | ||
441 | public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj) | ||
442 | { | ||
443 | handlerObjectBeingRemovedFromScene = OnObjectBeingRemovedFromScene; | ||
444 | if (handlerObjectBeingRemovedFromScene != null) | ||
445 | { | ||
446 | handlerObjectBeingRemovedFromScene(obj); | ||
447 | |||
448 | } | ||
449 | } | ||
450 | |||
441 | public void TriggerShutdown() | 451 | public void TriggerShutdown() |
442 | { | 452 | { |
443 | handlerShutdown = OnShutdown; | 453 | handlerShutdown = OnShutdown; |
@@ -725,16 +735,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
725 | } | 735 | } |
726 | } | 736 | } |
727 | 737 | ||
728 | public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj) | 738 | |
729 | { | ||
730 | handlerObjectBeingRemovedFromScene = OnObjectBeingRemovedFromScene; | ||
731 | if (handlerObjectBeingRemovedFromScene != null) | ||
732 | { | ||
733 | handlerObjectBeingRemovedFromScene(obj); | ||
734 | |||
735 | } | ||
736 | } | ||
737 | |||
738 | 739 | ||
739 | public void TriggerRequestParcelPrimCountUpdate() | 740 | public void TriggerRequestParcelPrimCountUpdate() |
740 | { | 741 | { |