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

Merge branch 'master' into careminster

avinationmerge
Melanie 2013-03-26 19:06:44 +00:00
parent 7b95c22129 e82fab34d7
commit 4365daa8e1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,7 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_MapImageServerURL = string.Empty; private string m_MapImageServerURL = string.Empty;
private string m_SearchURL = string.Empty; private string m_SearchURL = string.Empty;
private bool m_ExportSupported = false;
#region ISharedRegionModule Members #region ISharedRegionModule Members
@ -87,6 +88,8 @@ namespace OpenSim.Region.ClientStack.Linden
} }
m_SearchURL = config.GetString("SearchServerURI", string.Empty); m_SearchURL = config.GetString("SearchServerURI", string.Empty);
m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
} }
AddDefaultFeatures(); AddDefaultFeatures();
@ -152,6 +155,9 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_SearchURL != string.Empty) if (m_SearchURL != string.Empty)
gridServicesMap["search"] = m_SearchURL; gridServicesMap["search"] = m_SearchURL;
m_features["GridServices"] = gridServicesMap; m_features["GridServices"] = gridServicesMap;
if (m_ExportSupported)
m_features["ExportSupported"] = true;
} }
} }