aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs21
1 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 6e000f1..d4bdef6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.ClientStack.Linden
57 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")] 57 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")]
58 public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule 58 public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule
59 { 59 {
60// private static readonly ILog m_log = 60 private static readonly ILog m_log =
61// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 61 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
62 62
63 public event SimulatorFeaturesRequestDelegate OnSimulatorFeaturesRequest; 63 public event SimulatorFeaturesRequestDelegate OnSimulatorFeaturesRequest;
64 64
@@ -85,16 +85,21 @@ namespace OpenSim.Region.ClientStack.Linden
85 { 85 {
86 // These are normaly set in their respective modules 86 // These are normaly set in their respective modules
87 m_SearchURL = config.GetString("SearchServerURI", m_SearchURL); 87 m_SearchURL = config.GetString("SearchServerURI", m_SearchURL);
88
88 m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL); 89 m_DestinationGuideURL = config.GetString ("DestinationGuideURI", m_DestinationGuideURL);
90
89 if (m_DestinationGuideURL == string.Empty) // Make this consistent with the variable in the LoginService config 91 if (m_DestinationGuideURL == string.Empty) // Make this consistent with the variable in the LoginService config
90 m_DestinationGuideURL = config.GetString("DestinationGuide", m_DestinationGuideURL); 92 m_DestinationGuideURL = config.GetString("DestinationGuide", m_DestinationGuideURL);
93
91 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); 94 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
92 m_GridURL = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", 95
93 new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty); 96 m_GridURL = Util.GetConfigVarFromSections<string>(
97 source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty);
98
94 m_GridName = config.GetString("GridName", string.Empty); 99 m_GridName = config.GetString("GridName", string.Empty);
95 if (m_GridName == string.Empty) 100 if (m_GridName == string.Empty)
96 m_GridName = Util.GetConfigVarFromSections<string>(source, "gridname", 101 m_GridName = Util.GetConfigVarFromSections<string>(
97 new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty); 102 source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
98 } 103 }
99 104
100 AddDefaultFeatures(); 105 AddDefaultFeatures();
@@ -148,13 +153,13 @@ namespace OpenSim.Region.ClientStack.Linden
148 m_features["MeshUploadEnabled"] = true; 153 m_features["MeshUploadEnabled"] = true;
149 m_features["MeshXferEnabled"] = true; 154 m_features["MeshXferEnabled"] = true;
150 m_features["PhysicsMaterialsEnabled"] = true; 155 m_features["PhysicsMaterialsEnabled"] = true;
151 156
152 OSDMap typesMap = new OSDMap(); 157 OSDMap typesMap = new OSDMap();
153 typesMap["convex"] = true; 158 typesMap["convex"] = true;
154 typesMap["none"] = true; 159 typesMap["none"] = true;
155 typesMap["prim"] = true; 160 typesMap["prim"] = true;
156 m_features["PhysicsShapeTypes"] = typesMap; 161 m_features["PhysicsShapeTypes"] = typesMap;
157 162
158 // Extra information for viewers that want to use it 163 // Extra information for viewers that want to use it
159 // TODO: Take these out of here into their respective modules, like map-server-url 164 // TODO: Take these out of here into their respective modules, like map-server-url
160 OSDMap extrasMap; 165 OSDMap extrasMap;