aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorBlueWall2010-09-25 22:36:38 -0400
committerMelanie2010-09-26 17:04:11 +0100
commitb0b4782a2b3c7a86195ad09c1c508856c2885f4d (patch)
treec8a1fcd118540b07fb5f30d5a15d8dd0bbbba04e /OpenSim/Region/Physics/Manager
parentSome cleanup to OpenSimDefaults.ini (diff)
downloadopensim-SC-b0b4782a2b3c7a86195ad09c1c508856c2885f4d.zip
opensim-SC-b0b4782a2b3c7a86195ad09c1c508856c2885f4d.tar.gz
opensim-SC-b0b4782a2b3c7a86195ad09c1c508856c2885f4d.tar.bz2
opensim-SC-b0b4782a2b3c7a86195ad09c1c508856c2885f4d.tar.xz
adding configurable j2kDecodeCache path
allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/ZeroMesher.cs3
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 7130a3e..3763696 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Physics.Manager
81 if (_MeshPlugins.ContainsKey(meshEngineName)) 81 if (_MeshPlugins.ContainsKey(meshEngineName))
82 { 82 {
83 m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName); 83 m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName);
84 meshEngine = _MeshPlugins[meshEngineName].GetMesher(); 84 meshEngine = _MeshPlugins[meshEngineName].GetMesher(config);
85 } 85 }
86 else 86 else
87 { 87 {
@@ -234,6 +234,6 @@ namespace OpenSim.Region.Physics.Manager
234 public interface IMeshingPlugin 234 public interface IMeshingPlugin
235 { 235 {
236 string GetName(); 236 string GetName();
237 IMesher GetMesher(); 237 IMesher GetMesher(IConfigSource config);
238 } 238 }
239} 239}
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
index e6e75f9..ba19db6 100644
--- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs
+++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31using Nini.Config;
31 32
32/* 33/*
33 * This is the zero mesher. 34 * This is the zero mesher.
@@ -53,7 +54,7 @@ namespace OpenSim.Region.Physics.Manager
53 return "ZeroMesher"; 54 return "ZeroMesher";
54 } 55 }
55 56
56 public IMesher GetMesher() 57 public IMesher GetMesher(IConfigSource config)
57 { 58 {
58 return new ZeroMesher(); 59 return new ZeroMesher();
59 } 60 }