From d9055c8dc3f5a768b300aa72318c813bbc024e09 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 21 Apr 2011 15:12:52 -0400
Subject: Group collada meshies settings under [Mesh] in OpensimDefaults.ini
---
OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 ++-
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
public Meshmerizer(IConfigSource config)
{
IConfig start_config = config.Configs["Startup"];
+ IConfig mesh_config = config.Configs["Mesh"];
decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
- useMeshiesPhysicsMesh = start_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+ useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
try
{
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e72e851..b134b7e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -149,12 +149,6 @@
; to false if you have compatibility problems.
;CacheSculptMaps = true
- ; if you use Meshmerizer and want collisions for meshies, setting this to true
- ; will cause OpenSim to attempt to decode meshies assets, extract the physics
- ; mesh, and use it for collisions. This is currently experimental code and enabling
- ; it may cause unexpected physics problems.
- ;UseMeshiesPhysicsMesh = false
-
; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom
@@ -461,6 +455,12 @@
; default is true
; ColladaMesh = true
+ ; if you use Meshmerizer and want collisions for meshies, setting this to true
+ ; will cause OpenSim to attempt to decode meshies assets, extract the physics
+ ; mesh, and use it for collisions. This is currently experimental code and enabling
+ ; it may cause unexpected physics problems.
+ ;UseMeshiesPhysicsMesh = false
+
[ODEPhysicsSettings]
;##
--
cgit v1.1