diff options
author | Diva Canto | 2015-01-10 10:32:33 -0800 |
---|---|---|
committer | Diva Canto | 2015-01-10 10:32:33 -0800 |
commit | 2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889 (patch) | |
tree | 84af5b2ddf16209561928a1ea56414f88be3269e /OpenSim/Services/GridService/GridService.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889.zip opensim-SC_OLD-2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889.tar.gz opensim-SC_OLD-2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889.tar.bz2 opensim-SC_OLD-2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889.tar.xz |
SimulatorFeatures: the viewer also takes GridName in OpenSim extras. Added that (plus GridURL, in case viewers want to use it too) to the GridService that gives out that info to simulators.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 29723d8..3b1a07e 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -170,6 +170,19 @@ namespace OpenSim.Services.GridService | |||
170 | if (!string.IsNullOrEmpty(configVal)) | 170 | if (!string.IsNullOrEmpty(configVal)) |
171 | m_ExtraFeatures["destination-guide-url"] = configVal; | 171 | m_ExtraFeatures["destination-guide-url"] = configVal; |
172 | 172 | ||
173 | configVal = Util.GetConfigVarFromSections<string>( | ||
174 | config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" }, String.Empty); | ||
175 | if (!string.IsNullOrEmpty(configVal)) | ||
176 | m_ExtraFeatures["GridURL"] = configVal; | ||
177 | |||
178 | configVal = Util.GetConfigVarFromSections<string>( | ||
179 | config, "GridName", new string[] { "Const", "Hypergrid" }, String.Empty); | ||
180 | if (string.IsNullOrEmpty(configVal)) | ||
181 | configVal = Util.GetConfigVarFromSections<string>( | ||
182 | config, "gridname", new string[] { "GridInfo" }, String.Empty); | ||
183 | if (!string.IsNullOrEmpty(configVal)) | ||
184 | m_ExtraFeatures["GridName"] = configVal; | ||
185 | |||
173 | m_ExtraFeatures["ExportSupported"] = gridConfig.GetString("ExportSupported", "true"); | 186 | m_ExtraFeatures["ExportSupported"] = gridConfig.GetString("ExportSupported", "true"); |
174 | } | 187 | } |
175 | 188 | ||