diff options
| author | Melanie | 2012-01-05 08:15:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-05 08:15:33 +0000 |
| commit | 1ebc9d04aa33e18e22ee2f03465bc5950c3544ce (patch) | |
| tree | 3e7e39255ad455b59434979d47db7da243ac3dd6 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.zip opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.gz opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.bz2 opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 26f915b..d2e0ab0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1236,6 +1236,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1236 | 1236 | ||
| 1237 | try | 1237 | try |
| 1238 | { | 1238 | { |
| 1239 | m_eventManager.TriggerOnRegionStarted(this); | ||
| 1239 | while (!shuttingdown) | 1240 | while (!shuttingdown) |
| 1240 | Update(); | 1241 | Update(); |
| 1241 | } | 1242 | } |