diff options
| author | Justin Clark-Casey (justincc) | 2014-03-20 20:15:57 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-20 20:15:57 +0000 |
| commit | d04bb3ca9b992b1c64af4570df8a3218b2ef25e7 (patch) | |
| tree | 823acda5425d13b85a0e79d983f5a96a06e3a51e /OpenSim/Region/Framework | |
| parent | Mantis 6974 PERMISSION_TRACK_CAMERA should be implicit on attach. (diff) | |
| parent | Allow MaptileStaticFile path to be set to anywhere and not force it to bin/ma... (diff) | |
| download | opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.zip opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.gz opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.bz2 opensim-SC_OLD-d04bb3ca9b992b1c64af4570df8a3218b2ef25e7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fa90ef4..d16b73b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -903,7 +903,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 903 | 903 | ||
| 904 | if (m_generateMaptiles) | 904 | if (m_generateMaptiles) |
| 905 | { | 905 | { |
| 906 | int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0); | 906 | int maptileRefresh = Util.GetConfigVarFromSections<int>(config, "MaptileRefresh", possibleMapConfigSections, 0); |
| 907 | m_log.InfoFormat("[SCENE]: Region {0}, WORLD MAP refresh time set to {1} seconds", RegionInfo.RegionName, maptileRefresh); | ||
| 907 | if (maptileRefresh != 0) | 908 | if (maptileRefresh != 0) |
| 908 | { | 909 | { |
| 909 | m_mapGenerationTimer.Interval = maptileRefresh * 1000; | 910 | m_mapGenerationTimer.Interval = maptileRefresh * 1000; |