diff options
| author | Diva Canto | 2009-08-13 06:31:24 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-13 06:31:24 -0700 |
| commit | 6a0f7c22753a4e7e9d08e947d9fa4b6d98c1bf54 (patch) | |
| tree | b9dd4ca908d79a74abcd722d4fc5e7d26d01fd30 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| parent | Some small fixes (diff) | |
| download | opensim-SC-6a0f7c22753a4e7e9d08e947d9fa4b6d98c1bf54.zip opensim-SC-6a0f7c22753a4e7e9d08e947d9fa4b6d98c1bf54.tar.gz opensim-SC-6a0f7c22753a4e7e9d08e947d9fa4b6d98c1bf54.tar.bz2 opensim-SC-6a0f7c22753a4e7e9d08e947d9fa4b6d98c1bf54.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 1d4d6d7..7bbe045 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
| @@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; | 429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; |
| 430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; | 430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; |
| 431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; | 431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; |
| 432 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 432 | // TODO: unused: private ScriptTimerEvent handlerScriptTimerEvent = null; |
| 433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; | 433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; |
| 434 | 434 | ||
| 435 | private ScriptColliding handlerCollidingStart = null; | 435 | private ScriptColliding handlerCollidingStart = null; |