diff options
author | onefang | 2019-08-04 01:52:43 +1000 |
---|---|---|
committer | onefang | 2019-08-04 01:52:43 +1000 |
commit | b2dbd12a819207f65d64134ded2274a83e7ffc51 (patch) | |
tree | 93e40d3d61d92057f6e58c3745da6dfe5143c25f /OpenSim/Region/Framework | |
parent | Don't inform neighbours that we are up twice. (diff) | |
download | opensim-SC_OLD-b2dbd12a819207f65d64134ded2274a83e7ffc51.zip opensim-SC_OLD-b2dbd12a819207f65d64134ded2274a83e7ffc51.tar.gz opensim-SC_OLD-b2dbd12a819207f65d64134ded2274a83e7ffc51.tar.bz2 opensim-SC_OLD-b2dbd12a819207f65d64134ded2274a83e7ffc51.tar.xz |
Better sim startup finished messages.
Inform neighbours we are up before the finished messages.
Always send the "[RegionReady]: INITIALIZATION COMPLETE FOR" message.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index b255924..dd23bf6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1802,19 +1802,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1802 | GC.Collect(); | 1802 | GC.Collect(); |
1803 | if (!LoginLock) | 1803 | if (!LoginLock) |
1804 | { | 1804 | { |
1805 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1806 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1807 | |||
1805 | if (!StartDisabled) | 1808 | if (!StartDisabled) |
1806 | { | 1809 | { |
1807 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1810 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1808 | LoginsEnabled = true; | 1811 | LoginsEnabled = true; |
1809 | } | 1812 | } |
1810 | 1813 | ||
1811 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1812 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1813 | |||
1814 | // Region ready should always be set | 1814 | // Region ready should always be set |
1815 | Ready = true; | 1815 | Ready = true; |
1816 | } | 1816 | } |
1817 | else | 1817 | //// else |
1818 | { | 1818 | { |
1819 | // This handles a case of a region having no scripts for the RegionReady module | 1819 | // This handles a case of a region having no scripts for the RegionReady module |
1820 | if (m_sceneGraph.GetActiveScriptsCount() == 0) | 1820 | if (m_sceneGraph.GetActiveScriptsCount() == 0) |