aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-06-04 19:02:50 +0100
committerUbitUmarov2019-06-04 19:02:50 +0100
commit41e2379f976dbc21613b24eb74a946481b0b811f (patch)
tree22f1190642a9188adea6411c03ed44107e78d5d1 /OpenSim
parentadd sim feature AvatarHoverHeightEnabled; mantis 8535: make option MeshModelA... (diff)
downloadopensim-SC-41e2379f976dbc21613b24eb74a946481b0b811f.zip
opensim-SC-41e2379f976dbc21613b24eb74a946481b0b811f.tar.gz
opensim-SC-41e2379f976dbc21613b24eb74a946481b0b811f.tar.bz2
opensim-SC-41e2379f976dbc21613b24eb74a946481b0b811f.tar.xz
mantis 8460: reduce odds of watchdog timeout warning
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index da54c54..15294c3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -406,16 +406,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
406 406
407 WorkManager.StartThread( 407 WorkManager.StartThread(
408 process, 408 process,
409 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName), 409 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName));
410 ThreadPriority.BelowNormal,
411 true,
412 false);
413 WorkManager.StartThread( 410 WorkManager.StartThread(
414 MapBlockSendThread, 411 MapBlockSendThread,
415 string.Format("MapBlockSendThread ({0})", m_scene.RegionInfo.RegionName), 412 string.Format("MapBlockSendThread ({0})", m_scene.RegionInfo.RegionName));
416 ThreadPriority.BelowNormal,
417 true,
418 false);
419 } 413 }
420 414
421 /// <summary> 415 /// <summary>
@@ -482,7 +476,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
482 // viewers only ask for green dots to each region now 476 // viewers only ask for green dots to each region now
483 // except at login with regionhandle 0 477 // except at login with regionhandle 0
484 // possible on some other rare ocasions 478 // possible on some other rare ocasions
485 // use previus hack of sending all items with the green dots 479 // use previous hack of sending all items with the green dots
486 480
487 bool adultRegion; 481 bool adultRegion;
488 if (regionhandle == 0) 482 if (regionhandle == 0)
@@ -1189,6 +1183,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1189 return; 1183 return;
1190 1184
1191 GetAndSendBlocksInternal(req.client, req.minX, req.minY, req.maxX, req.maxY, req.flags); 1185 GetAndSendBlocksInternal(req.client, req.minX, req.minY, req.maxX, req.maxY, req.flags);
1186 Watchdog.UpdateThread();
1192 } 1187 }
1193 1188
1194 thisRunData.Clear(); 1189 thisRunData.Clear();