From 2fd252f5a9ffc06fcaabf2a1e0889f01dcba4889 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 10 Jan 2015 10:32:33 -0800
Subject: 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.

---
 OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

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
 
             if (config != null)
             {  
-                // These are normaly set in their respective modules
+                //
+                // All this is obsolete since getting these features from the grid service!!
+                // Will be removed after the next release
+                //
                 m_SearchURL = config.GetString("SearchServerURI", m_SearchURL);
 
                 m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL);
-- 
cgit v1.1