diff options
| author | Melanie | 2010-08-06 18:08:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-06 18:08:40 +0100 |
| commit | 26387252f5adbf71dc77084ff2d1b463fad5038c (patch) | |
| tree | 0453fd501165368affa2917180ef3e43c5555ea0 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Fix a parenthesis in prior commit (diff) | |
| download | opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.zip opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.gz opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.bz2 opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 644fbb0..d55c7a1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1918,9 +1918,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1918 | 1918 | ||
| 1919 | foreach (SceneObjectGroup group in PrimsFromDB) | 1919 | foreach (SceneObjectGroup group in PrimsFromDB) |
| 1920 | { | 1920 | { |
| 1921 | EventManager.TriggerOnSceneObjectLoaded(group); | ||
| 1922 | |||
| 1921 | if (group.RootPart == null) | 1923 | if (group.RootPart == null) |
| 1922 | { | 1924 | { |
| 1923 | m_log.ErrorFormat("[SCENE] Found a SceneObjectGroup with m_rootPart == null and {0} children", | 1925 | m_log.ErrorFormat("[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children", |
| 1924 | group.Children == null ? 0 : group.Children.Count); | 1926 | group.Children == null ? 0 : group.Children.Count); |
| 1925 | } | 1927 | } |
| 1926 | 1928 | ||