OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add region-side extra feature setting for destination guide

bullet-2.82
BlueWall 2014-07-31 08:17:00 -04:00
parent 50ed97aa1a
commit cac910d401
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack.Linden
private OSDMap m_features = new OSDMap(); private OSDMap m_features = new OSDMap();
private string m_SearchURL = string.Empty; private string m_SearchURL = string.Empty;
private string m_DestinationGuideURL = string.Empty;
private bool m_ExportSupported = false; private bool m_ExportSupported = false;
#region ISharedRegionModule Members #region ISharedRegionModule Members
@ -88,6 +89,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (config != null && m_AllowOverride == true) if (config != null && m_AllowOverride == true)
{ {
m_SearchURL = config.GetString("SearchServerURI", string.Empty); m_SearchURL = config.GetString("SearchServerURI", string.Empty);
m_DestinationGuideURL = config.GetString ("DestinationGuideURI", string.Empty);
m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
} }
@ -161,6 +163,8 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_SearchURL != string.Empty && m_AllowOverride == true) if (m_SearchURL != string.Empty && m_AllowOverride == true)
extrasMap["search-server-url"] = m_SearchURL; 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) if (m_ExportSupported && m_AllowOverride == true)
extrasMap["ExportSupported"] = true; extrasMap["ExportSupported"] = true;

2
bin/OpenSim.ini.example
View File

@ -552,6 +552,8 @@
;MapImageServerURI = "http://127.0.0.1:9000/" ;MapImageServerURI = "http://127.0.0.1:9000/"
;# {SearchServerURI} {} {URL of the search server} {} ;# {SearchServerURI} {} {URL of the search server} {}
;SearchServerURI = "http://127.0.0.1:9000/" ;SearchServerURI = "http://127.0.0.1:9000/"
;# {DestinationGuideURI} {} {URL of the destination guide} {}
;DestinationGuideURI = "http://127.0.0.1:9000/"
[Chat] [Chat]