diff options
| author | Melanie | 2012-05-15 03:16:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-15 03:16:12 +0100 |
| commit | 65e1d7b2d7a9c08799118263219bf77526f34fa5 (patch) | |
| tree | a38c64c5076d18137c8422e0f1b4d28710041017 /OpenSim | |
| parent | Try to fix sqlite breakage (diff) | |
| download | opensim-SC_OLD-65e1d7b2d7a9c08799118263219bf77526f34fa5.zip opensim-SC_OLD-65e1d7b2d7a9c08799118263219bf77526f34fa5.tar.gz opensim-SC_OLD-65e1d7b2d7a9c08799118263219bf77526f34fa5.tar.bz2 opensim-SC_OLD-65e1d7b2d7a9c08799118263219bf77526f34fa5.tar.xz | |
Guard against null root part on SQLite. This really needs to be fixed so SQLite
loads roots before children like MySQL does.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ae8f25d..e3f06f8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4285,7 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4285 | 4285 | ||
| 4286 | public void aggregateScriptEvents() | 4286 | public void aggregateScriptEvents() |
| 4287 | { | 4287 | { |
| 4288 | if (ParentGroup.RootPart == null) | 4288 | if (ParentGroup == null || ParentGroup.RootPart == null) |
| 4289 | return; | 4289 | return; |
| 4290 | 4290 | ||
| 4291 | AggregateScriptEvents = 0; | 4291 | AggregateScriptEvents = 0; |