diff options
| author | Melanie | 2009-10-08 10:32:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 10:32:15 +0100 |
| commit | f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch) | |
| tree | de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Region/CoreModules/World | |
| parent | Correct a build break caused by an optimization in trunk (diff) | |
| parent | Remove ThreadTrackerTest. It's no longer relevant because the thread (diff) | |
| download | opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 05ed70a..4fb4c51 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -345,7 +345,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 345 | mapItemReqThread.Priority = ThreadPriority.BelowNormal; | 345 | mapItemReqThread.Priority = ThreadPriority.BelowNormal; |
| 346 | mapItemReqThread.SetApartmentState(ApartmentState.MTA); | 346 | mapItemReqThread.SetApartmentState(ApartmentState.MTA); |
| 347 | mapItemReqThread.Start(); | 347 | mapItemReqThread.Start(); |
| 348 | ThreadTracker.Add(mapItemReqThread); | ||
| 349 | } | 348 | } |
| 350 | 349 | ||
| 351 | /// <summary> | 350 | /// <summary> |
| @@ -447,7 +446,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 447 | // end gracefully | 446 | // end gracefully |
| 448 | if (st.agentID == UUID.Zero) | 447 | if (st.agentID == UUID.Zero) |
| 449 | { | 448 | { |
| 450 | ThreadTracker.Remove(mapItemReqThread); | ||
| 451 | break; | 449 | break; |
| 452 | } | 450 | } |
| 453 | 451 | ||