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/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.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/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index d4bdef6..07e8025 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -83,7 +83,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
83 | 83 | ||
84 | if (config != null) | 84 | if (config != null) |
85 | { | 85 | { |
86 | // These are normaly set in their respective modules | 86 | // |
87 | // All this is obsolete since getting these features from the grid service!! | ||
88 | // Will be removed after the next release | ||
89 | // | ||
87 | m_SearchURL = config.GetString("SearchServerURI", m_SearchURL); | 90 | m_SearchURL = config.GetString("SearchServerURI", m_SearchURL); |
88 | 91 | ||
89 | m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL); | 92 | m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL); |