aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2019-08-29 09:08:45 +0100
committerUbitUmarov2019-08-29 09:08:45 +0100
commitc0521482ceacab54da65600265d5d878b906359b (patch)
tree2d4bd98f1d3dea1508da3d34d21804406545a4db /OpenSim/Region
parent update libomv with simpler Texture.GetBakesBytes (diff)
downloadopensim-SC-c0521482ceacab54da65600265d5d878b906359b.zip
opensim-SC-c0521482ceacab54da65600265d5d878b906359b.tar.gz
opensim-SC-c0521482ceacab54da65600265d5d878b906359b.tar.bz2
opensim-SC-c0521482ceacab54da65600265d5d878b906359b.tar.xz
add a test sim feature
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index b52f2fd..bcba142 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -78,6 +78,8 @@ namespace OpenSim.Region.ClientStack.Linden
78 private string m_GridURL = string.Empty; 78 private string m_GridURL = string.Empty;
79 79
80 private bool m_doScriptSyntax; 80 private bool m_doScriptSyntax;
81 private bool m_BoMSupported = false;
82
81 static private object m_scriptSyntaxLock = new object(); 83 static private object m_scriptSyntaxLock = new object();
82 static private UUID m_scriptSyntaxID = UUID.Zero; 84 static private UUID m_scriptSyntaxID = UUID.Zero;
83 static private string m_scriptSyntaxXML; 85 static private string m_scriptSyntaxXML;
@@ -111,6 +113,8 @@ namespace OpenSim.Region.ClientStack.Linden
111 m_GridName = Util.GetConfigVarFromSections<string>( 113 m_GridName = Util.GetConfigVarFromSections<string>(
112 source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty); 114 source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
113 m_doScriptSyntax = config.GetBoolean("ScriptSyntax", m_doScriptSyntax); 115 m_doScriptSyntax = config.GetBoolean("ScriptSyntax", m_doScriptSyntax);
116 m_BoMSupported = config.GetBoolean("BoMSupported", m_BoMSupported);
117
114 } 118 }
115 119
116 ReadScriptSyntax(); 120 ReadScriptSyntax();
@@ -154,13 +158,15 @@ namespace OpenSim.Region.ClientStack.Linden
154 /// </remarks> 158 /// </remarks>
155 private void AddDefaultFeatures() 159 private void AddDefaultFeatures()
156 { 160 {
157
158 lock (m_features) 161 lock (m_features)
159 { 162 {
160 m_features["MeshRezEnabled"] = true; 163 m_features["MeshRezEnabled"] = true;
161 m_features["MeshUploadEnabled"] = true; 164 m_features["MeshUploadEnabled"] = true;
162 m_features["MeshXferEnabled"] = true; 165 m_features["MeshXferEnabled"] = true;
163 166
167 if(m_BoMSupported)
168 m_features["BakesOnMeshEnabled"] = true;
169
164 m_features["PhysicsMaterialsEnabled"] = true; 170 m_features["PhysicsMaterialsEnabled"] = true;
165 171
166 OSDMap typesMap = new OSDMap(); 172 OSDMap typesMap = new OSDMap();