aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2019-08-27 21:24:54 +0100
committerUbitUmarov2019-08-27 21:24:54 +0100
commit60fa28740abaddd8f55513063ae528bac28ac7c7 (patch)
treedc7864f51d083b13c3587937eae27671285f108a /OpenSim/Region/Framework
parentmantis 8583: osGetRegionMapTexture(); now returns prim region map textureID, ... (diff)
downloadopensim-SC-60fa28740abaddd8f55513063ae528bac28ac7c7.zip
opensim-SC-60fa28740abaddd8f55513063ae528bac28ac7c7.tar.gz
opensim-SC-60fa28740abaddd8f55513063ae528bac28ac7c7.tar.bz2
opensim-SC-60fa28740abaddd8f55513063ae528bac28ac7c7.tar.xz
mantis 8583: update region information on Grid on map regeneration
Diffstat (limited to 'OpenSim/Region/Framework')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 377ba29..03f46bb 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Framework.Scenes
1040 { 1040 {
1041 m_mapGenerationTimer.Interval = maptileRefresh * 1000; 1041 m_mapGenerationTimer.Interval = maptileRefresh * 1000;
1042 m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister; 1042 m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
1043 m_mapGenerationTimer.AutoReset = true; 1043 m_mapGenerationTimer.AutoReset = false;
1044 m_mapGenerationTimer.Start(); 1044 m_mapGenerationTimer.Start();
1045 } 1045 }
1046 } 1046 }
@@ -6026,7 +6026,9 @@ Environment.Exit(1);
6026 // so that all simulators can retrieve it 6026 // so that all simulators can retrieve it
6027 string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); 6027 string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
6028 if (error != string.Empty) 6028 if (error != string.Empty)
6029 throw new Exception(error); 6029 throw new Exception(error);
6030 if(m_generateMaptiles)
6031 m_mapGenerationTimer.Start();
6030 } 6032 }
6031 6033
6032 /// <summary> 6034 /// <summary>