From a2009ffe2e71afefad79471811418df8958870ab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 16 Mar 2012 13:08:05 -0700
Subject: Terrain: added [Terrain] section with an option to load an initial
 flat terrain. Default is still pinhead island. I much rather have a flat land
 in the beginning.

---
 bin/OpenSimDefaults.ini | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fab2c47..fd31131 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1512,6 +1512,9 @@
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+[Terrain]
+    InitialTerrain = "pinhead-island"
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
-- 
cgit v1.1


From 6146e7ef258b10888ad7464b72b75cca701e02c9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Mar 2012 12:57:12 -0700
Subject: Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY
 DEFAULT. Turns out that this can't be expressed by cascading Permission
 modules, so I did it as per this patch.

---
 bin/OpenSimDefaults.ini | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fd31131..1a0d801 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,6 +260,13 @@
     ; Default value is all
     ; allowed_script_editors = all
 
+    ; Provides a simple control for land owners to give build rights to
+    ; publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; Disabled by default
+    ; simple_build_permissions = False
+
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
-- 
cgit v1.1


From 45b588cf008c514f461bf43c168dcdc9902b7bb9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Mar 2012 20:10:38 +0000
Subject: Revert "Simple build permissions feature. NOTE: EXPERIMENTAL,
 DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading
 Permission modules, so I did it as per this patch."

This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
---
 bin/OpenSimDefaults.ini | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1a0d801..fd31131 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,13 +260,6 @@
     ; Default value is all
     ; allowed_script_editors = all
 
-    ; Provides a simple control for land owners to give build rights to
-    ; publicly accessible parcels that disallow object creation in general. 
-    ; Owners specific avatars by adding them to the Access List of the parcel
-    ; without having to use the Groups feature
-    ; Disabled by default
-    ; simple_build_permissions = False
-
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
-- 
cgit v1.1


From 25e5b6a76c4cc517306d25a692e1c147507238f0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Mar 2012 14:21:07 -0700
Subject: Added new simple_build_permissions config to the .ini and .example
 files.

---
 bin/OpenSimDefaults.ini | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fd31131..3470b82 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,6 +260,14 @@
     ; Default value is all
     ; allowed_script_editors = all
 
+    ; Provides a simple control for land owners to give build rights to specific avatars
+    ; in publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; Disabled by default
+    ; simple_build_permissions = False
+
+
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
-- 
cgit v1.1


From e5b182fb41fb78a271b45f40e3d50e387bc38ad8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Mar 2012 03:37:59 +0000
Subject: Add information about SendPeriodicAppearanceUpdates to
 OpenSimDefaults.ini for now.

Default remains false.
---
 bin/OpenSimDefaults.ini | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3470b82..6986046 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -177,6 +177,11 @@
     ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
     MaximumTimeBeforePersistenceConsidered = 600
 
+    ; Experimental setting to resend appearance updates every 60 seconds.
+    ; These packets are small and this can help with grey avatar syndrome.
+    ; Default is false
+    SendPeriodicAppearanceUpdates = false
+
     ; ##
     ; ## PHYSICS
     ; ##
-- 
cgit v1.1


From b22d0401693dad44790d4cbf58d85c0fe3870460 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Mar 2012 16:37:21 -0700
Subject: BulletSim: add some new runtime setable parameters to match the dll.

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6986046..1216bce 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,7 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0
+    AvatarFriction = 0.5
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From de24feb275ddd1c7e7c0b04900718a9000b8d49b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 18 Mar 2012 11:53:53 -0700
Subject: BulletSim: Add AvatarRestitution parameter. Centralize computation of
 buoyancy for flying. Tweek avatar default friction and resititution

---
 bin/OpenSimDefaults.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1216bce..a31e6f4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,8 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0.5
+    AvatarFriction = 0.2
+    AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From 142de1d02f086c80888eb216cfd31b84ec27a79b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 10:59:40 -0700
Subject: BulletSim: add a bunch of internal Bullet configuration parameters to
 OpenSimDefaults.ini and the code.

---
 bin/OpenSimDefaults.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a31e6f4..34f70a2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -851,6 +851,7 @@
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
+    AvatarContactProcessingThreshold = 0.1;
 
     MaxObjectMass = 10000.01
 
@@ -863,6 +864,14 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    MaxPersistantManifoldPoolSize = 0;
+    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldForceUpdateAllAabbs = False;
+    ShouldRandomizeSolverOrder = False;
+    ShouldSplitSimulationIslands = False;
+    ShouldEnableFrictionCaching = False;
+    NumberOfSolverIterations = 0;   
+
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1


From ff54b3c3661a6bf9d5f0d9a24f8aeed5b42ce0ce Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 15:50:32 -0700
Subject: BulletSim: change default of
 shouldDisableContactPoolDynamicAllocation from False to True. It seems that
 collisions don't happen well when it is False (things fall through terrain).

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 34f70a2..41be415 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -865,7 +865,7 @@
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldDisableContactPoolDynamicAllocation = True;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
-- 
cgit v1.1


From 84c9bd52d3c2e01f1b385a6dd0fc4822a652867b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 26 Mar 2012 13:48:15 -0700
Subject: BulletSim: update BulletSim binaries and configuration fixing a crash
 which happens when there are more than a few hundred physical objects.

---
 bin/OpenSimDefaults.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 41be415..28c5587 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -864,8 +864,9 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = True;
+    ShouldDisableContactPoolDynamicAllocation = False;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
-- 
cgit v1.1