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/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-304c5d4a8b8a1137bac18f7f6443ea85cec86184.zip opensim-SC_OLD-304c5d4a8b8a1137bac18f7f6443ea85cec86184.tar.gz opensim-SC_OLD-304c5d4a8b8a1137bac18f7f6443ea85cec86184.tar.bz2 opensim-SC_OLD-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 '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d19b8b6..355f7b3 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -700,6 +700,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 700 | 700 | ||
| 701 | IScene newScene; | 701 | IScene newScene; |
| 702 | m_application.CreateRegion(region, out newScene); | 702 | m_application.CreateRegion(region, out newScene); |
| 703 | newScene.Start(); | ||
| 703 | 704 | ||
| 704 | // If an access specification was provided, use it. | 705 | // If an access specification was provided, use it. |
| 705 | // Otherwise accept the default. | 706 | // Otherwise accept the default. |