diff options
| author | Melanie | 2013-02-27 18:05:04 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-27 18:05:04 +0000 |
| commit | 578174d21c82e7249016e31f0c63215e67f92f17 (patch) | |
| tree | c9c970d2ce4836dcf894922172d784d16cbc2837 /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve description of GenerateMapTiles config option (diff) | |
| download | opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.zip opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.gz opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.bz2 opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index c868ee4..bf18616 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 94 | if (Util.GetConfigVarFromSections<string>( | 94 | if (Util.GetConfigVarFromSections<string>( |
| 95 | config, "WorldMapModule", configSections, "WorldMap") == "WorldMap") | 95 | config, "WorldMapModule", configSections, "WorldMap") == "WorldMap") |
| 96 | m_Enabled = true; | 96 | m_Enabled = true; |
| 97 | 97 | ||
| 98 | blacklistTimeout | 98 | blacklistTimeout |
| 99 | = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000; | 99 | = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000; |
| 100 | } | 100 | } |