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

Fix ghosts copy of SimulatorFeatureModule to enable logging.

mb-throttle-test
Justin Clark-Casey (justincc) 2014-11-25 23:28:38 +00:00
parent 66b1c37973
commit 20cede12a9
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,8 +57,8 @@ namespace OpenSim.Region.ClientStack.Linden
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")]
public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule
{ {
// private static readonly ILog m_log = private static readonly ILog m_log =
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public event SimulatorFeaturesRequestDelegate OnSimulatorFeaturesRequest; public event SimulatorFeaturesRequestDelegate OnSimulatorFeaturesRequest;
@ -85,16 +85,21 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
// These are normaly set in their respective modules // These are normaly set in their respective modules
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);
if (m_DestinationGuideURL == string.Empty) // Make this consistent with the variable in the LoginService config if (m_DestinationGuideURL == string.Empty) // Make this consistent with the variable in the LoginService config
m_DestinationGuideURL = config.GetString("DestinationGuide", m_DestinationGuideURL); m_DestinationGuideURL = config.GetString("DestinationGuide", 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_GridURL = Util.GetConfigVarFromSections<string>(
source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty);
m_GridName = config.GetString("GridName", string.Empty); m_GridName = config.GetString("GridName", string.Empty);
if (m_GridName == string.Empty) if (m_GridName == string.Empty)
m_GridName = Util.GetConfigVarFromSections<string>(source, "gridname", m_GridName = Util.GetConfigVarFromSections<string>(
new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty); source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
} }
AddDefaultFeatures(); AddDefaultFeatures();
@ -148,13 +153,13 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["MeshUploadEnabled"] = true; m_features["MeshUploadEnabled"] = true;
m_features["MeshXferEnabled"] = true; m_features["MeshXferEnabled"] = true;
m_features["PhysicsMaterialsEnabled"] = true; m_features["PhysicsMaterialsEnabled"] = true;
OSDMap typesMap = new OSDMap(); OSDMap typesMap = new OSDMap();
typesMap["convex"] = true; typesMap["convex"] = true;
typesMap["none"] = true; typesMap["none"] = true;
typesMap["prim"] = true; typesMap["prim"] = true;
m_features["PhysicsShapeTypes"] = typesMap; m_features["PhysicsShapeTypes"] = typesMap;
// Extra information for viewers that want to use it // Extra information for viewers that want to use it
// TODO: Take these out of here into their respective modules, like map-server-url // TODO: Take these out of here into their respective modules, like map-server-url
OSDMap extrasMap; OSDMap extrasMap;