From cac910d401d9a3863d08463ea5ae8e9e690a1a4e Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 31 Jul 2014 08:17:00 -0400 Subject: [PATCH] Add region-side extra feature setting for destination guide --- .../Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 4 ++++ bin/OpenSim.ini.example | 2 ++ 2 files changed, 6 insertions(+) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 587cb7090f..2859953bb9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs @@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack.Linden private OSDMap m_features = new OSDMap(); private string m_SearchURL = string.Empty; + private string m_DestinationGuideURL = string.Empty; private bool m_ExportSupported = false; #region ISharedRegionModule Members @@ -88,6 +89,7 @@ namespace OpenSim.Region.ClientStack.Linden if (config != null && m_AllowOverride == true) { m_SearchURL = config.GetString("SearchServerURI", string.Empty); + m_DestinationGuideURL = config.GetString ("DestinationGuideURI", string.Empty); m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); } @@ -161,6 +163,8 @@ namespace OpenSim.Region.ClientStack.Linden if (m_SearchURL != string.Empty && m_AllowOverride == true) extrasMap["search-server-url"] = m_SearchURL; + if (!string.IsNullOrEmpty(m_DestinationGuideURL) && m_AllowOverride == true) + extrasMap["destination-guide-url"] = m_DestinationGuideURL; if (m_ExportSupported && m_AllowOverride == true) extrasMap["ExportSupported"] = true; diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d83a154507..f0e1a8a668 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -552,6 +552,8 @@ ;MapImageServerURI = "http://127.0.0.1:9000/" ;# {SearchServerURI} {} {URL of the search server} {} ;SearchServerURI = "http://127.0.0.1:9000/" + ;# {DestinationGuideURI} {} {URL of the destination guide} {} + ;DestinationGuideURI = "http://127.0.0.1:9000/" [Chat]