diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-13 12:39:46 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-13 12:39:46 -0400 |
| commit | 9bcca3dc95450103b0c02949034f2b979632f07b (patch) | |
| tree | ff92eca3681692391fe6e106856f0c9524885d22 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
| parent | * minor: comments (diff) | |
| parent | Some small fixes (diff) | |
| download | opensim-SC-9bcca3dc95450103b0c02949034f2b979632f07b.zip opensim-SC-9bcca3dc95450103b0c02949034f2b979632f07b.tar.gz opensim-SC-9bcca3dc95450103b0c02949034f2b979632f07b.tar.bz2 opensim-SC-9bcca3dc95450103b0c02949034f2b979632f07b.tar.xz | |
Merge branch 'master' of ssh://MyConnection/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; |