diff options
| author | Melanie | 2012-05-15 02:36:11 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-15 02:36:11 +0200 |
| commit | 995cd25f3027e1debb0ae5fc60b5dde831c31d17 (patch) | |
| tree | f8a76f4d545c0753dd0cdf3fd1909be83810d552 /OpenSim/Region | |
| parent | don't send colision events to volume detectors (diff) | |
| download | opensim-SC_OLD-995cd25f3027e1debb0ae5fc60b5dde831c31d17.zip opensim-SC_OLD-995cd25f3027e1debb0ae5fc60b5dde831c31d17.tar.gz opensim-SC_OLD-995cd25f3027e1debb0ae5fc60b5dde831c31d17.tar.bz2 opensim-SC_OLD-995cd25f3027e1debb0ae5fc60b5dde831c31d17.tar.xz | |
Port the mel/dahlia fix
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 81244ef..7a1720c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4706,6 +4706,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4706 | 4706 | ||
| 4707 | public void aggregateScriptEvents() | 4707 | public void aggregateScriptEvents() |
| 4708 | { | 4708 | { |
| 4709 | if (ParentGroup == null || ParentGroup.RootPart == null) | ||
| 4710 | return; | ||
| 4711 | |||
| 4709 | AggregateScriptEvents = 0; | 4712 | AggregateScriptEvents = 0; |
| 4710 | 4713 | ||
| 4711 | // Aggregate script events | 4714 | // Aggregate script events |