aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2014-07-31 08:17:00 -0400
committerBlueWall2014-07-31 08:20:06 -0400
commitcac910d401d9a3863d08463ea5ae8e9e690a1a4e (patch)
tree50086ed0a9df618165de39586b99cc99a7cfdc0e
parentBulletSim: thread safe handling of list of avatars. (diff)
downloadopensim-SC_OLD-cac910d401d9a3863d08463ea5ae8e9e690a1a4e.zip
opensim-SC_OLD-cac910d401d9a3863d08463ea5ae8e9e690a1a4e.tar.gz
opensim-SC_OLD-cac910d401d9a3863d08463ea5ae8e9e690a1a4e.tar.bz2
opensim-SC_OLD-cac910d401d9a3863d08463ea5ae8e9e690a1a4e.tar.xz
Add region-side extra feature setting for destination guide
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs4
-rw-r--r--bin/OpenSim.ini.example2
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 587cb70..2859953 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
71 private OSDMap m_features = new OSDMap(); 71 private OSDMap m_features = new OSDMap();
72 72
73 private string m_SearchURL = string.Empty; 73 private string m_SearchURL = string.Empty;
74 private string m_DestinationGuideURL = string.Empty;
74 private bool m_ExportSupported = false; 75 private bool m_ExportSupported = false;
75 76
76 #region ISharedRegionModule Members 77 #region ISharedRegionModule Members
@@ -88,6 +89,7 @@ namespace OpenSim.Region.ClientStack.Linden
88 if (config != null && m_AllowOverride == true) 89 if (config != null && m_AllowOverride == true)
89 { 90 {
90 m_SearchURL = config.GetString("SearchServerURI", string.Empty); 91 m_SearchURL = config.GetString("SearchServerURI", string.Empty);
92 m_DestinationGuideURL = config.GetString ("DestinationGuideURI", string.Empty);
91 93
92 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); 94 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
93 } 95 }
@@ -161,6 +163,8 @@ namespace OpenSim.Region.ClientStack.Linden
161 163
162 if (m_SearchURL != string.Empty && m_AllowOverride == true) 164 if (m_SearchURL != string.Empty && m_AllowOverride == true)
163 extrasMap["search-server-url"] = m_SearchURL; 165 extrasMap["search-server-url"] = m_SearchURL;
166 if (!string.IsNullOrEmpty(m_DestinationGuideURL) && m_AllowOverride == true)
167 extrasMap["destination-guide-url"] = m_DestinationGuideURL;
164 if (m_ExportSupported && m_AllowOverride == true) 168 if (m_ExportSupported && m_AllowOverride == true)
165 extrasMap["ExportSupported"] = true; 169 extrasMap["ExportSupported"] = true;
166 170
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d83a154..f0e1a8a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -552,6 +552,8 @@
552 ;MapImageServerURI = "http://127.0.0.1:9000/" 552 ;MapImageServerURI = "http://127.0.0.1:9000/"
553 ;# {SearchServerURI} {} {URL of the search server} {} 553 ;# {SearchServerURI} {} {URL of the search server} {}
554 ;SearchServerURI = "http://127.0.0.1:9000/" 554 ;SearchServerURI = "http://127.0.0.1:9000/"
555 ;# {DestinationGuideURI} {} {URL of the destination guide} {}
556 ;DestinationGuideURI = "http://127.0.0.1:9000/"
555 557
556 558
557[Chat] 559[Chat]