diff options
| author | Melanie | 2012-02-24 09:56:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-24 09:56:06 +0000 |
| commit | 37068d17c5a6a4679f75af12cbbcfc3c78790e33 (patch) | |
| tree | 42454c2fd6072b0baebb4f3d7632476de3ad18e9 /OpenSim/Region/CoreModules/World | |
| parent | Partially apply the core banlines fix (diff) | |
| parent | Take watchdog alarm calling back outside the m_threads lock. (diff) | |
| download | opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 4ebfb21..548ff91 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -351,6 +351,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 351 | process, | 351 | process, |
| 352 | string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName), | 352 | string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName), |
| 353 | ThreadPriority.BelowNormal, | 353 | ThreadPriority.BelowNormal, |
| 354 | true, | ||
| 354 | true); | 355 | true); |
| 355 | } | 356 | } |
| 356 | 357 | ||