From a95e28616842f70bb64bf701c2534d75490e539e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 11 Dec 2017 23:36:42 +0000 Subject: [PATCH] increase sample rate of WaitGetScenePresence() --- OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++-- bin/config-include/Standalone.ini | 4 ++++ bin/config-include/StandaloneHypergrid.ini | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c06b3dd401..c223aaef79 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -4632,10 +4632,10 @@ Label_GroupsDone: /// protected virtual ScenePresence WaitGetScenePresence(UUID agentID) { - int ntimes = 30; + int ntimes = 120; // 30s ScenePresence sp = null; while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) - Thread.Sleep(1000); + Thread.Sleep(250); if (sp == null) m_log.WarnFormat( diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index db7cb365cd..4e683e2ab8 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -22,6 +22,7 @@ InventoryAccessModule = "BasicInventoryAccessModule" MapImageService = "MapImageServiceModule" SearchModule = "BasicSearchModule" + MuteListService = "LocalMuteListServicesConnector" LibraryModule = true LLLoginServiceInConnector = true @@ -113,6 +114,9 @@ [MapImageService] LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" +[MuteListService] + LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService" + ;; This should always be the very last thing on this file [Includes] Include-Common = "config-include/StandaloneCommon.ini" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 84867a9a3c..4f3994f9af 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -27,6 +27,7 @@ FriendsModule = "HGFriendsModule" UserManagementModule = "HGUserManagementModule" SearchModule = "BasicSearchModule" + MuteListService = "LocalMuteListServicesConnector" InventoryServiceInConnector = true AssetServiceInConnector = true @@ -190,6 +191,9 @@ UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" InGatekeeper = True +[MuteListService] + LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService" + ;; This should always be the very last thing on this file [Includes] Include-Common = "config-include/StandaloneCommon.ini"