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

Added grid information to SimFeatures response, so that the viewer can show it.

mb-throttle-test
Diva Canto 2014-11-06 17:49:04 -08:00
parent 26606190e5
commit ac051ef4ab
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ using Nini.Config;
using Mono.Addins; using Mono.Addins;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
//using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
@ -72,6 +72,8 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_SearchURL = string.Empty; private string m_SearchURL = string.Empty;
private string m_DestinationGuideURL = string.Empty; private string m_DestinationGuideURL = string.Empty;
private bool m_ExportSupported = false; private bool m_ExportSupported = false;
private string m_GridName = string.Empty;
private string m_GridURL = string.Empty;
#region ISharedRegionModule Members #region ISharedRegionModule Members
@ -85,6 +87,12 @@ namespace OpenSim.Region.ClientStack.Linden
m_SearchURL = config.GetString("SearchServerURI", m_SearchURL); m_SearchURL = config.GetString("SearchServerURI", m_SearchURL);
m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL); m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL);
m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
m_GridURL = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI",
new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty);
m_GridName = config.GetString("GridName", string.Empty);
if (m_GridName == string.Empty)
m_GridName = Util.GetConfigVarFromSections<string>(source, "gridname",
new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
} }
AddDefaultFeatures(); AddDefaultFeatures();
@ -161,6 +169,10 @@ namespace OpenSim.Region.ClientStack.Linden
extrasMap["destination-guide-url"] = m_DestinationGuideURL; extrasMap["destination-guide-url"] = m_DestinationGuideURL;
if (m_ExportSupported) if (m_ExportSupported)
extrasMap["ExportSupported"] = true; extrasMap["ExportSupported"] = true;
if (m_GridURL != string.Empty)
extrasMap["GridURL"] = m_GridURL;
if (m_GridName != string.Empty)
extrasMap["GridName"] = m_GridName;
if (extrasMap.Count > 0) if (extrasMap.Count > 0)
m_features["OpenSimExtras"] = extrasMap; m_features["OpenSimExtras"] = extrasMap;