diff options
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 4 | ||||
-rw-r--r-- | 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 c06b3dd..c223aae 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4632,10 +4632,10 @@ Label_GroupsDone: | |||
4632 | /// <param name='agentID'></param> | 4632 | /// <param name='agentID'></param> |
4633 | protected virtual ScenePresence WaitGetScenePresence(UUID agentID) | 4633 | protected virtual ScenePresence WaitGetScenePresence(UUID agentID) |
4634 | { | 4634 | { |
4635 | int ntimes = 30; | 4635 | int ntimes = 120; // 30s |
4636 | ScenePresence sp = null; | 4636 | ScenePresence sp = null; |
4637 | while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) | 4637 | while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) |
4638 | Thread.Sleep(1000); | 4638 | Thread.Sleep(250); |
4639 | 4639 | ||
4640 | if (sp == null) | 4640 | if (sp == null) |
4641 | m_log.WarnFormat( | 4641 | m_log.WarnFormat( |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index db7cb36..4e683e2 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -22,6 +22,7 @@ | |||
22 | InventoryAccessModule = "BasicInventoryAccessModule" | 22 | InventoryAccessModule = "BasicInventoryAccessModule" |
23 | MapImageService = "MapImageServiceModule" | 23 | MapImageService = "MapImageServiceModule" |
24 | SearchModule = "BasicSearchModule" | 24 | SearchModule = "BasicSearchModule" |
25 | MuteListService = "LocalMuteListServicesConnector" | ||
25 | 26 | ||
26 | LibraryModule = true | 27 | LibraryModule = true |
27 | LLLoginServiceInConnector = true | 28 | LLLoginServiceInConnector = true |
@@ -113,6 +114,9 @@ | |||
113 | [MapImageService] | 114 | [MapImageService] |
114 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 115 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
115 | 116 | ||
117 | [MuteListService] | ||
118 | LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService" | ||
119 | |||
116 | ;; This should always be the very last thing on this file | 120 | ;; This should always be the very last thing on this file |
117 | [Includes] | 121 | [Includes] |
118 | Include-Common = "config-include/StandaloneCommon.ini" | 122 | Include-Common = "config-include/StandaloneCommon.ini" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 84867a9..4f3994f 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -27,6 +27,7 @@ | |||
27 | FriendsModule = "HGFriendsModule" | 27 | FriendsModule = "HGFriendsModule" |
28 | UserManagementModule = "HGUserManagementModule" | 28 | UserManagementModule = "HGUserManagementModule" |
29 | SearchModule = "BasicSearchModule" | 29 | SearchModule = "BasicSearchModule" |
30 | MuteListService = "LocalMuteListServicesConnector" | ||
30 | 31 | ||
31 | InventoryServiceInConnector = true | 32 | InventoryServiceInConnector = true |
32 | AssetServiceInConnector = true | 33 | AssetServiceInConnector = true |
@@ -190,6 +191,9 @@ | |||
190 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 191 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
191 | InGatekeeper = True | 192 | InGatekeeper = True |
192 | 193 | ||
194 | [MuteListService] | ||
195 | LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService" | ||
196 | |||
193 | ;; This should always be the very last thing on this file | 197 | ;; This should always be the very last thing on this file |
194 | [Includes] | 198 | [Includes] |
195 | Include-Common = "config-include/StandaloneCommon.ini" | 199 | Include-Common = "config-include/StandaloneCommon.ini" |