diff options
author | Justin Clark-Casey (justincc) | 2013-05-03 18:48:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-03 18:48:50 +0100 |
commit | 304c5d4a8b8a1137bac18f7f6443ea85cec86184 (patch) | |
tree | 33833264d210694546b17447a5f42f010084b0ad /OpenSim/Region/Application | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-304c5d4a8b8a1137bac18f7f6443ea85cec86184.zip opensim-SC-304c5d4a8b8a1137bac18f7f6443ea85cec86184.tar.gz opensim-SC-304c5d4a8b8a1137bac18f7f6443ea85cec86184.tar.bz2 opensim-SC-304c5d4a8b8a1137bac18f7f6443ea85cec86184.tar.xz |
On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index d86eefe..f9e0cf1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -425,9 +425,6 @@ namespace OpenSim | |||
425 | 425 | ||
426 | mscene = scene; | 426 | mscene = scene; |
427 | 427 | ||
428 | scene.Start(); | ||
429 | scene.StartScripts(); | ||
430 | |||
431 | return clientServers; | 428 | return clientServers; |
432 | } | 429 | } |
433 | 430 | ||
@@ -751,6 +748,7 @@ namespace OpenSim | |||
751 | ShutdownClientServer(whichRegion); | 748 | ShutdownClientServer(whichRegion); |
752 | IScene scene; | 749 | IScene scene; |
753 | CreateRegion(whichRegion, true, out scene); | 750 | CreateRegion(whichRegion, true, out scene); |
751 | scene.Start(); | ||
754 | } | 752 | } |
755 | 753 | ||
756 | # region Setup methods | 754 | # region Setup methods |