diff options
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 211a0a7..64774d8 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -84,10 +84,11 @@ namespace OpenSim.Region.Physics.Meshing | |||
84 | public Meshmerizer(IConfigSource config) | 84 | public Meshmerizer(IConfigSource config) |
85 | { | 85 | { |
86 | IConfig start_config = config.Configs["Startup"]; | 86 | IConfig start_config = config.Configs["Startup"]; |
87 | IConfig mesh_config = config.Configs["Mesh"]; | ||
87 | 88 | ||
88 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); | 89 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); |
89 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); | 90 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
90 | useMeshiesPhysicsMesh = start_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); | 91 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); |
91 | 92 | ||
92 | try | 93 | try |
93 | { | 94 | { |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 30ebf84..2521c6c 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -149,12 +149,6 @@ | |||
149 | ; to false if you have compatibility problems. | 149 | ; to false if you have compatibility problems. |
150 | ;CacheSculptMaps = true | 150 | ;CacheSculptMaps = true |
151 | 151 | ||
152 | ; if you use Meshmerizer and want collisions for meshies, setting this to true | ||
153 | ; will cause OpenSim to attempt to decode meshies assets, extract the physics | ||
154 | ; mesh, and use it for collisions. This is currently experimental code and enabling | ||
155 | ; it may cause unexpected physics problems. | ||
156 | ;UseMeshiesPhysicsMesh = false | ||
157 | |||
158 | ; Choose one of the physics engines below | 152 | ; Choose one of the physics engines below |
159 | ; OpenDynamicsEngine is by some distance the most developed physics engine | 153 | ; OpenDynamicsEngine is by some distance the most developed physics engine |
160 | ; basicphysics effectively does not model physics at all, making all objects phantom | 154 | ; basicphysics effectively does not model physics at all, making all objects phantom |
@@ -461,6 +455,12 @@ | |||
461 | ; default is true | 455 | ; default is true |
462 | ColladaMesh = true | 456 | ColladaMesh = true |
463 | 457 | ||
458 | ; if you use Meshmerizer and want collisions for meshies, setting this to true | ||
459 | ; will cause OpenSim to attempt to decode meshies assets, extract the physics | ||
460 | ; mesh, and use it for collisions. This is currently experimental code and enabling | ||
461 | ; it may cause unexpected physics problems. | ||
462 | ;UseMeshiesPhysicsMesh = false | ||
463 | |||
464 | 464 | ||
465 | [ODEPhysicsSettings] | 465 | [ODEPhysicsSettings] |
466 | ;## | 466 | ;## |