aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6b0af6d..d85d3df 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -167,7 +167,10 @@ namespace Flotsam.RegionModules.AssetCache
167 } 167 }
168 else 168 else
169 { 169 {
170 m_CachCleanTimer.Enabled = false; 170 lock (m_CachCleanTimer)
171 {
172 m_CachCleanTimer.Enabled = false;
173 }
171 } 174 }
172 175
173 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1); 176 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 0827672..1c71a99 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -443,8 +443,8 @@ namespace OpenSim.Region.Framework.Scenes
443 int startX = (int) pRegionLocX - 1; 443 int startX = (int) pRegionLocX - 1;
444 int startY = (int) pRegionLocY - 1; 444 int startY = (int) pRegionLocY - 1;
445 445
446 int endX = (int) pRegionLocX + (int)extent.X + 1; 446 int endX = (int) pRegionLocX + (int)extent.X;
447 int endY = (int) pRegionLocY + (int)extent.Y + 1; 447 int endY = (int) pRegionLocY + (int)extent.Y;
448 448
449 for (int i=startX;i<endX;i++) 449 for (int i=startX;i<endX;i++)
450 { 450 {