aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-08-15 17:59:57 +0100
committerUbitUmarov2019-08-15 17:59:57 +0100
commit12abb3ffe45d09d8b6176d91149d2a8c9b61e798 (patch)
tree13b480a4deee859e6ebbeff82e2df61270cb252f /OpenSim
parentmantis 8575: npc map dots could be sent on another spot (diff)
downloadopensim-SC-12abb3ffe45d09d8b6176d91149d2a8c9b61e798.zip
opensim-SC-12abb3ffe45d09d8b6176d91149d2a8c9b61e798.tar.gz
opensim-SC-12abb3ffe45d09d8b6176d91149d2a8c9b61e798.tar.bz2
opensim-SC-12abb3ffe45d09d8b6176d91149d2a8c9b61e798.tar.xz
make HGworldmap initialize its base wordmap
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 8c44ee2..c602c71 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -58,8 +58,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
58 58
59 public override void Initialise(IConfigSource source) 59 public override void Initialise(IConfigSource source)
60 { 60 {
61 string[] configSections = new string[] { "Map", "Startup" };
61 if (Util.GetConfigVarFromSections<string>( 62 if (Util.GetConfigVarFromSections<string>(
62 source, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap") 63 source, "WorldMapModule", configSections, "WorldMap") == "HGWorldMap")
63 { 64 {
64 m_Enabled = true; 65 m_Enabled = true;
65 66
@@ -72,7 +73,14 @@ namespace OpenSim.Region.CoreModules.Hypergrid
72 m_MapImageServerURL = m_MapImageServerURL + "/"; 73 m_MapImageServerURL = m_MapImageServerURL + "/";
73 } 74 }
74 75
76 expireBlackListTime = (double)Util.GetConfigVarFromSections<int>(source, "BlacklistTimeout", configSections, 10 * 60);
75 77
78 m_exportPrintScale =
79 Util.GetConfigVarFromSections<bool>(source, "ExportMapAddScale", configSections, m_exportPrintScale);
80 m_exportPrintRegionName =
81 Util.GetConfigVarFromSections<bool>(source, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
82 m_showNPCs =
83 Util.GetConfigVarFromSections<bool>(source, "ShowNPCs", configSections, m_showNPCs);
76 } 84 }
77 } 85 }
78 86