aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorDiva Canto2013-07-30 21:10:00 -0700
committerDiva Canto2013-07-30 21:10:00 -0700
commitfd050fca7caef83d72d00241d0c0db5c1ec5d1ff (patch)
tree7f6c05282088c75b51aa900e1c7f85f0e0735f6f /OpenSim/Region/ClientStack/Linden
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-fd050fca7caef83d72d00241d0c0db5c1ec5d1ff.zip
opensim-SC_OLD-fd050fca7caef83d72d00241d0c0db5c1ec5d1ff.tar.gz
opensim-SC_OLD-fd050fca7caef83d72d00241d0c0db5c1ec5d1ff.tar.bz2
opensim-SC_OLD-fd050fca7caef83d72d00241d0c0db5c1ec5d1ff.tar.xz
Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).
Only HG Visitors get this var, to avoid spamming local users. The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs15
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 4bd17b1..e4d8a20 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.ClientStack.Linden
68 /// </summary> 68 /// </summary>
69 private OSDMap m_features = new OSDMap(); 69 private OSDMap m_features = new OSDMap();
70 70
71 private string m_MapImageServerURL = string.Empty;
72 private string m_SearchURL = string.Empty; 71 private string m_SearchURL = string.Empty;
73 private bool m_ExportSupported = false; 72 private bool m_ExportSupported = false;
74 73
@@ -78,15 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
78 { 77 {
79 IConfig config = source.Configs["SimulatorFeatures"]; 78 IConfig config = source.Configs["SimulatorFeatures"];
80 if (config != null) 79 if (config != null)
81 { 80 {
82 m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
83 if (m_MapImageServerURL != string.Empty)
84 {
85 m_MapImageServerURL = m_MapImageServerURL.Trim();
86 if (!m_MapImageServerURL.EndsWith("/"))
87 m_MapImageServerURL = m_MapImageServerURL + "/";
88 }
89
90 m_SearchURL = config.GetString("SearchServerURI", string.Empty); 81 m_SearchURL = config.GetString("SearchServerURI", string.Empty);
91 82
92 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); 83 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
@@ -149,13 +140,13 @@ namespace OpenSim.Region.ClientStack.Linden
149 m_features["PhysicsShapeTypes"] = typesMap; 140 m_features["PhysicsShapeTypes"] = typesMap;
150 141
151 // Extra information for viewers that want to use it 142 // Extra information for viewers that want to use it
143 // TODO: Take these out of here into their respective modules, like map-server-url
152 OSDMap extrasMap = new OSDMap(); 144 OSDMap extrasMap = new OSDMap();
153 if (m_MapImageServerURL != string.Empty)
154 extrasMap["map-server-url"] = m_MapImageServerURL;
155 if (m_SearchURL != string.Empty) 145 if (m_SearchURL != string.Empty)
156 extrasMap["search-server-url"] = m_SearchURL; 146 extrasMap["search-server-url"] = m_SearchURL;
157 if (m_ExportSupported) 147 if (m_ExportSupported)
158 extrasMap["ExportSupported"] = true; 148 extrasMap["ExportSupported"] = true;
149
159 if (extrasMap.Count > 0) 150 if (extrasMap.Count > 0)
160 m_features["OpenSimExtras"] = extrasMap; 151 m_features["OpenSimExtras"] = extrasMap;
161 152