aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-07-27 16:23:08 +0100
committerUbitUmarov2017-07-27 16:23:08 +0100
commit324bda8ab96f4c6b17c221ea73842ca599270c00 (patch)
treeb6c0c7f8896a89d4a7b761096a3bde0b4cec8145
parent display remaining pass time in hours, mins or seconds acording to value (diff)
downloadopensim-SC-324bda8ab96f4c6b17c221ea73842ca599270c00.zip
opensim-SC-324bda8ab96f4c6b17c221ea73842ca599270c00.tar.gz
opensim-SC-324bda8ab96f4c6b17c221ea73842ca599270c00.tar.bz2
opensim-SC-324bda8ab96f4c6b17c221ea73842ca599270c00.tar.xz
mantis 8218 make Meshmerizer UseMeshiesPhysicsMesh defualt to true, to match stated on ini files.
-rw-r--r--OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs2
-rw-r--r--bin/OpenSimDefaults.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
index 4f95554..0d4b6b9 100644
--- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing
66 66
67 private bool cacheSculptMaps = true; 67 private bool cacheSculptMaps = true;
68 private string decodedSculptMapPath = null; 68 private string decodedSculptMapPath = null;
69 private bool useMeshiesPhysicsMesh = false; 69 private bool useMeshiesPhysicsMesh = true;
70 70
71 private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh 71 private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
72 72
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 164eae6..3747fcf 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -943,7 +943,7 @@
943 ; Minimum user level required to upload meshes 943 ; Minimum user level required to upload meshes
944 ;LevelUpload = 0 944 ;LevelUpload = 0
945 945
946 ; support meshs on physics 946 ; support meshes on physics
947 ;UseMeshiesPhysicsMesh = true 947 ;UseMeshiesPhysicsMesh = true
948 948
949 ;support convex shape type on normal prims 949 ;support convex shape type on normal prims