From 80d9b336ff996741022ce9b1e7c95a650d15c465 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 4 Feb 2013 07:07:36 +0000
Subject: Remove [XMLRPC] section I added by accident to the top of
 OpenSimDefaults.ini in previous commit 95883282

---
 bin/OpenSimDefaults.ini | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ebdb96..9119273 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,21 +1,6 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
-[XMLRPC]
-    ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
-    ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
-    ;; "xmlrpc_uri(string)" to the script concurrently with the first 
-    ;; remote_data event. This will contain the fully qualified URI an 
-    ;; external site needs to use to send XMLRPC requests to that script
-    ;;   
-    ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
-    ;; will be registered with an external service via a configured uri
-    XmlRpcRouterModule = "XmlRpcRouterModule"
-
-    ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
-    XmlRpcPort = 20800
-
-
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
-- 
cgit v1.1


From dce9e323f4f0fdccd2f34266e870de9cbcebd2f0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 5 Feb 2013 16:51:02 -0800
Subject: BulletSim: remove degenerate triangles from meshes. This fixes the
 invisible barriers in sculptie doorways (Mantis 6529). Bump up
 level-of-detail for physical meshes to 32 (the max). This fixes the invisible
 barriers that showed up in prim cut arches. NOTE: the default LOD values are
 removed from OpenSimDefaults.ini.    If you don't change your
 OpenSimDefaults.ini, you will continue    to see the arch problem.

---
 bin/OpenSimDefaults.ini | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9119273..7bdfd1c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -916,13 +916,9 @@
 
     ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
     ;  you will want to switch to the heightfield option
-
     TerrainImplementation = 1
     ; TerrainImplementation = 0
 
-    DefaultFriction = 0.20
-    DefaultDensity = 10.000006836
-    DefaultRestitution = 0.0
     Gravity = -9.80665
 
     TerrainFriction = 0.30
@@ -931,7 +927,7 @@
     TerrainCollisionMargin = 0.04
 
     AvatarFriction = 0.2
-    AvatarStandingFriction = 10.0
+    AvatarStandingFriction = 0.95
     AvatarRestitution = 0.0
     AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
@@ -943,7 +939,7 @@
 
     CollisionMargin = 0.04
 
-    ; Linkset constraint parameters
+    ; Linkset implmentation
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
     ; Whether to mesh sculpties
@@ -952,14 +948,6 @@
     ; If 'true', force simple prims (box and sphere) to be meshed
     ForceSimplePrimMeshing = false
 
-    ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
-    MeshLevelOfDetail = 8
-    ; if mesh size is > threshold meters, we need to add more detail because people will notice
-    MeshLevelOfDetailMegaPrimThreshold = 10
-    MeshLevelOfDetailMegaPrim = 16
-    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
-    SculptLevelOfDetail = 32
-
     ; Bullet step parameters
     MaxSubSteps = 10
     FixedTimeStep = .01667
-- 
cgit v1.1