From 659c741ff5a3d13b4462d3ce906c6785bb296322 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:15:01 +0100
Subject: Add more notes to async_call_method relating to 
 UnsafeQueueUserWorkItem

UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges.
However, since we must already trust this code anyway in OpenSimulator this is not an issue.
---
 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 1d2c0cf..28c1db2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -43,9 +43,14 @@
     ; Sets the method that OpenSim will use to fire asynchronous
     ; events. Valid values are UnsafeQueueUserWorkItem,
     ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
+    ;
     ; SmartThreadPool is reported to work well on Mono/Linux, but
     ; UnsafeQueueUserWorkItem has been benchmarked with better
     ; performance on .NET/Windows
+    ;
+    ; UnsafeQueueUserWorkItem refers to the fact that the code creating the event could elevate its security 
+    ; privileges.  However, as calling code is trusted anyway this is safe (if you set
+    ;  TrustedBinaries = true in the [XEngine] section then you already have to trust that incoming code for other reasons).
     async_call_method = SmartThreadPool
 
     ; Max threads to allocate on the FireAndForget thread pool
-- 
cgit v1.1


From e92c05ebbdc44084326c3dcfa0a2ca0958e4b5e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 May 2013 18:01:48 -0700
Subject: Added AvatarPickerSearch capability handler.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 28c1db2..7666243 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -609,6 +609,10 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
+
+	; Capability for searching for people
+	Cap_AvatarPickerSearch = "localhost"
+
     
 
 [Chat]
-- 
cgit v1.1


From 601aa9116348a88e8fe4d33f7dd7408ddc6fee28 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 May 2013 19:16:42 -0700
Subject: Delete "" entry for AvatarPicker cap.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7666243..0e35c63 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -545,7 +545,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
-- 
cgit v1.1


From 33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 8 May 2013 13:13:51 -0700
Subject: Adds an event and a method so that handling of the CachedTexture
 packet can be pulled out of LLClientView and moved to AvatarFactory. The
 first pass at reusing textures (turned off by default) is included. When
 reusing textures, if the baked textures from a previous login are still in
 the asset service (which generally means that they are in the simulator's
 cache) then the avatar will not need to rebake. This is both a performance
 improvement (specifically that an avatars baked textures do not need to be
 sent to other users who have the old textures cached) and a resource
 improvement (don't have to deal with duplicate bakes in the asset service
 cache).

---
 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 0e35c63..81843b1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -683,6 +683,9 @@
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
     ResendAppearanceUpdates = true
 
+    ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar 
+    ; on every login
+    ReuseTextures = false
 
 [Attachments]
     ; Controls whether avatar attachments are enabled.
-- 
cgit v1.1


From 328883700a15e4216bf7b251ac099d38f413375e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 13 May 2013 22:11:28 -0400
Subject: UserProfiles

  UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
---
 bin/OpenSimDefaults.ini | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 81843b1..237f684 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -377,6 +377,19 @@
     AllowRegionRestartFromClient = true
 
 
+[UserProfiles]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; If the ProfileURL is not set, then very BASIC
+  ;; profile support will be configured. If the ProfileURL is set to a 
+  ;; valid URL, then full profile support will be configured. The URL 
+  ;; points to your grid's Robust user profiles service
+  ;; 
+  ; ProfileURL = http://127.0.0.1:9000
+
+
+
 [SMTP]
     enabled = false
 
-- 
cgit v1.1


From 3aa2fb99289162b4338b7550a39411bebd74d97b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 30 May 2013 09:19:42 -0700
Subject: BulletSim: remove unuseful BulletSim parameters from
 OpenSimDefaults.ini and replace with things someone might actually want to
 tune (avatar height, ...).

---
 bin/OpenSimDefaults.ini | 57 ++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 81843b1..6cdf146 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -921,56 +921,49 @@
     ;force_simple_prim_meshing = true
 
 [BulletSim]
-    ; World parameters
+    ; All the BulletSim parameters can be displayed with the console command "physics get all"
+    ;    and all are defined in the source file OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
 
     ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
-    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
-
+    ; bulletxna is a managed C# dll.  They have comparible functionality but the c++ one is much faster.
     BulletEngine = "bulletunmanaged"
     ; BulletEngine = "bulletxna"
 
-    ; 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
-
-    Gravity = -9.80665
-
-    TerrainFriction = 0.30
-    TerrainHitFraction = 0.8
-    TerrainRestitution = 0
-    TerrainCollisionMargin = 0.04
+    ; Terrain Implementation
+    TerrainImplementation = 1   ; 0=Heightfield, 1=mesh
+    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield resolution). '2'
+    ;    gives 512x512. Etc. Cannot be larger than '4'. Higher magnification uses lots of memory.
+    TerrainMeshMagnification = 2
 
-    AvatarFriction = 0.2
-    AvatarStandingFriction = 0.95
-    AvatarRestitution = 0.0
-    AvatarDensity = 3.5
-    AvatarCapsuleWidth = 0.6
-    AvatarCapsuleDepth = 0.45
-    AvatarCapsuleHeight = 1.5
-    AvatarContactProcessingThreshold = 0.1
+    ; Avatar physics height adjustments. http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
+    AvatarHeightLowFudge = -0.2     ; Adjustment at low end of height range
+    AvatarHeightMidFudge = 0.1      ; Adjustment at mid point of avatar height range
+    AvatarHeightHighFudge = 0.1     ; Adjustment at high end of height range
 
-    MaxObjectMass = 10000.01
-
-    CollisionMargin = 0.04
-
-    ; Linkset implmentation
+    ; Default linkset implmentation
+    ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' builds a compound
+    ;     shape from the children shapes to create a single physical shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
-    ; Whether to mesh sculpties
+    ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
 
     ; If 'true', force simple prims (box and sphere) to be meshed
+    ; If 'false', the Bullet native special case shape is used for square rectangles and even dimensioned spheres
     ForceSimplePrimMeshing = false
 
-    ; Bullet step parameters
-    MaxSubSteps = 10
-    FixedTimeStep = .01667
+    ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
+    ;    Happens often in sculpties. If turned off, there will be some doorways that cannot be walked through.
+    ShouldRemoveZeroWidthTriangles = true
+
+    ; If 'true', use convex hull definition in mesh asset if present.
+    ShouldUseAssetHulls = true
 
+    ; If there are thousands of physical objects, these maximums should be increased.
     MaxCollisionsPerFrame = 2048
     MaxUpdatesPerFrame = 8192
 
-    ; Detailed physics debug logging
+    ; Detailed physics debug logging. Very verbose.
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
-- 
cgit v1.1


From a65cec3986431f5a2f4f9eb2424157def0d035c8 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 6 Jul 2013 08:22:59 -0700
Subject: BulletSim: implementation of linkset center-of-mass. Default off, for
 the moment, until more testing. Add separate thread and center-of-mass flags
 to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.

---
 bin/OpenSimDefaults.ini | 56 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 19 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4a89fe2..4a3104e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -919,54 +919,72 @@
     ; ## Joint support
     ; ##
 
-    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
-    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
-    ; default is false
+    ; If you would like physics joints to be enabled through a special naming
+    ;   convention in the client, set this to true.
+    ;   (See NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
+    ; Default is false
     ;use_NINJA_physics_joints = true
 
     ; ##
     ; ## additional meshing options
     ; ##
 
-    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
-    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
-    ; true. Note that this will increase memory usage and region startup time. Default is false.
+    ; Physical collision mesh proxies are normally created for complex prim shapes,
+    ;   and collisions for simple boxes and spheres are computed algorithmically.
+    ;   If you would rather have mesh proxies for simple prims, you can set this to
+    ;   true. Note that this will increase memory usage and region startup time.
+    ; Default is false.
     ;force_simple_prim_meshing = true
 
 [BulletSim]
-    ; All the BulletSim parameters can be displayed with the console command "physics get all"
-    ;    and all are defined in the source file OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
+    ; All the BulletSim parameters can be displayed with the console command
+    ;   "physics get all" and all are defined in the source file
+    ;    OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
 
-    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
-    ; bulletxna is a managed C# dll.  They have comparible functionality but the c++ one is much faster.
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a
+    ;   native c++ dll bulletxna is a managed C# dll.  They have comparible functionality
+    ;   but the c++ one is much faster.
     BulletEngine = "bulletunmanaged"
     ; BulletEngine = "bulletxna"
 
-    ; Terrain Implementation
-    TerrainImplementation = 1   ; 0=Heightfield, 1=mesh
-    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield resolution). '2'
-    ;    gives 512x512. Etc. Cannot be larger than '4'. Higher magnification uses lots of memory.
+    ; BulletSim can run on its own thread independent of the simulator's heartbeat
+    ;   thread. Enabling this will nto let the physics engine slow down avatar movement, etc.
+    UseSeparatePhysicsThread = false
+
+    ; Terrain implementation can use either Bullet's heightField or BulletSim can build
+    ;   a mesh. 0=heightField, 1=mesh
+    TerrainImplementation = 1
+    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
+    ;   resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
+    ;   magnification uses lots of memory.
     TerrainMeshMagnification = 2
 
-    ; Avatar physics height adjustments. http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
+    ; Avatar physics height adjustments.
+    ;   http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
     AvatarHeightLowFudge = -0.2     ; Adjustment at low end of height range
     AvatarHeightMidFudge = 0.1      ; Adjustment at mid point of avatar height range
     AvatarHeightHighFudge = 0.1     ; Adjustment at high end of height range
 
     ; Default linkset implmentation
-    ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' builds a compound
-    ;     shape from the children shapes to create a single physical shape. 'Compound' uses a lot less CPU time.
+    ; 'Constraint' uses physics constraints to hold linkset together. 'Compound'
+    ;    builds a compound shape from the children shapes to create a single physical
+    ;    shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
+	; If 'true', offset a linkset's origin based on mass of linkset parts.
+	LinksetOffsetCenterOfMass = false
+
     ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
 
     ; If 'true', force simple prims (box and sphere) to be meshed
-    ; If 'false', the Bullet native special case shape is used for square rectangles and even dimensioned spheres
+    ; If 'false', the Bullet native special case shape is used for square rectangles
+    ;   and even dimensioned spheres.
     ForceSimplePrimMeshing = false
 
     ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
-    ;    Happens often in sculpties. If turned off, there will be some doorways that cannot be walked through.
+    ;   Happens often in sculpties. If turned off, there will be some doorways
+    ;   that cannot be walked through.
     ShouldRemoveZeroWidthTriangles = true
 
     ; If 'true', use convex hull definition in mesh asset if present.
-- 
cgit v1.1


From 9432f3c94d0b0345132e5ff9eaf966b96cf218c2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 19:04:30 -0700
Subject: Improvements to the ServiceThrottleModule: added a category and an
 itemid to the interface, so that duplicate requests aren't enqueued more than
 once.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4a3104e..8079632 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1727,5 +1727,9 @@ MaxStringSpace = 0
 	;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
 	MaxDistance = 100.0
 
+[ServiceThrottle]
+    ;; Default time interval (in ms) for the throttle service thread to wake up
+    Interval = 5000
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
-- 
cgit v1.1


From e103e34f1d17d218c55ebb1ff19450c018cf73b2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 11:23:19 -0700
Subject: Added config var that we all thought was already there:
 see_into_region. (Note: different from the defunct see_into_neighboring_sim,
 which used to control the process from the other end). This enables child
 agents in neighbors for which the root agent doesn't have permission to be
 in.

---
 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 8079632..6aa534a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,6 +86,9 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
+	;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+	see_into_region = true
+
     ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
     ; Increasing this number will increase memory usage.
     MaxPrimUndos = 20
-- 
cgit v1.1


From 1572e91b5f74c991230e15b7ca120e83a6ed3eb4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 08:04:48 -0700
Subject: Clarifications on documentation of Group configs

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6aa534a..e70b9b3 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1612,7 +1612,6 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-    ; This currently only applies to the Flotsam XmlRpc backend
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-- 
cgit v1.1


From 9cbbb7eddfb3316a2db5bfaa0e81a39850e7163d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 19:16:48 -0700
Subject: Clarification on docs of .ini.examples for Groups (again)

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e70b9b3..dbafd5c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1612,6 +1612,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
+	; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-- 
cgit v1.1


From 216e785ca9ca7dee51c32e69952a79b6e87733d1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 21:16:53 +0100
Subject: Add experimental "debug attachments throttle <ms>" setting (command
 line) and ThrottlePer100PrimsRezzed in [Attachments] in config

This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging.  A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
---
 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 dbafd5c..2488bf1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -703,11 +703,18 @@
     ; on every login
     ReuseTextures = false
 
+
 [Attachments]
     ; Controls whether avatar attachments are enabled.
     ; Defaults to true - only set to false for debugging purposes
     Enabled = true
 
+    ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
+    ; Experimental setting to control CPU spiking when avatars with many attachments login
+    ; or when multiple avatars with medium level attachments login simultaneously.
+    ; If 0 then no throttling is performed.
+    ThrottlePer100PrimsRezzed = 0;
+
 
 [Mesh]
     ; enable / disable Collada mesh support
-- 
cgit v1.1


From c9695a0a59cba91a184683efaa7802338d68e4bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 00:00:00 +0100
Subject: Move experimental attachments throttling further down the chain so
 that multiple attachments changes (e.g. change outfit) are also throttled

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2488bf1..d5d29ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -710,8 +710,8 @@
     Enabled = true
 
     ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
-    ; Experimental setting to control CPU spiking when avatars with many attachments login
-    ; or when multiple avatars with medium level attachments login simultaneously.
+    ; Experimental setting to control CPU spiking when avatars with many attachments login/change outfit
+    ; or when multiple avatars with medium level attachments login/change outfit simultaneously.
     ; If 0 then no throttling is performed.
     ThrottlePer100PrimsRezzed = 0;
 
-- 
cgit v1.1


From d9bd6e6b5be3100141a3b1202f859c65a302d4ee Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 09:41:11 -0700
Subject: Add parameter and explanation of ManagedStats return to
 OpenSimDefaults.ini. Add 'callback' query parameter to managed stats return
 to return function form of JSON data.

---
 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 d5d29ec..0a85085 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -264,8 +264,15 @@
 
     ; Simulator Stats URI
     ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Returns regular sim stats (SimFPS, ...)
     ; Stats_URI = "jsonSimStats"
 
+    ; Simulator StatsManager URI
+    ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally
+    ; specify category, container and stat to fetch. If not selected, returns all of that type.
+    ; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic
+    ; ManagedStatsRemoteFetchURI = "ManagedStats"
+
     ; Make OpenSim start all regions woth logins disabled. They will need
     ; to be enabled from the console if this is set
     ; StartDisabled = false
-- 
cgit v1.1


From ec5f17b2cecc38a21ae3b1276b3a391f7c004c5d Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Tue, 10 Sep 2013 18:35:02 -0400
Subject: This extends the default max_distance for teleports to 16384, a big
 thank you to all of the viewer devs who made this possibe!

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0a85085..28f0f4b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -653,8 +653,8 @@
 
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
-    max_distance = 4095
+    ; This is set to 16384 because current viewers can't handle teleports that are greater than this distance
+    max_distance = 16384
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
-- 
cgit v1.1


From 663059ac5c65f5fcf9e4313a2c2edfb5b5df0829 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Tue, 10 Sep 2013 19:56:39 -0400
Subject: chaning the default max_distance to 16383 as we actually start
 counting at zero, thank you dahlia for pointing this out.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 28f0f4b..e168566 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -653,8 +653,8 @@
 
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 16384 because current viewers can't handle teleports that are greater than this distance
-    max_distance = 16384
+    ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance
+    max_distance = 16383
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
-- 
cgit v1.1


From 3c85afbb431d14a676c00d20bfeeb5e2d13e8eaf Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 12 Sep 2013 11:46:12 -0400
Subject: Allow setting the EntityTransfer-max_distance to 0 to override
 distance checks. This is to facilitate current viewer work fixing the
 distance limitations for teleporting.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e168566..c16dee2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -652,8 +652,11 @@
 
 
 [EntityTransfer]
-    ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance
+    ; The maximum distance in regions that an agent is allowed to teleport 
+    ; along the x or y axis. This is set to 16383 because current viewers 
+    ; can't handle teleports that are greater than this distance
+    ; Setting to 0 will allow teleports of any distance
+    ;
     max_distance = 16383
 
     ; Minimum user level required for HyperGrid teleports
-- 
cgit v1.1


From 53de6d94ea5e80b873864be32f1781bc2f7017c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 12 Sep 2013 23:38:50 +0100
Subject: minor: replace spaces with tabs for see_into_region setting

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c16dee2..7954a14 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,8 +86,8 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
-	;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
-	see_into_region = true
+    ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+    see_into_region = true
 
     ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
     ; Increasing this number will increase memory usage.
-- 
cgit v1.1


From 979b17165b7e504385187ab082ef0a8cd50605bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 22:45:50 +0100
Subject: For debug purposes, allow simulators to force use of earlier
 SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available.

This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
---
 bin/OpenSimDefaults.ini | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7954a14..8da4daf 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -636,7 +636,6 @@
 	Cap_AvatarPickerSearch = "localhost"
 
     
-
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -652,6 +651,15 @@
 
 
 [EntityTransfer]
+    ; The maximum protocol version that we will use for outgoing transfers
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    MaxOutgoingTransferVersion = "SIMULATION/0.2"
+
     ; The maximum distance in regions that an agent is allowed to teleport 
     ; along the x or y axis. This is set to 16383 because current viewers 
     ; can't handle teleports that are greater than this distance
-- 
cgit v1.1


From 585d0800dd61798ec2640e3f42f7d41fb9fa5b33 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 00:14:40 +0100
Subject: minor: Make OpenSimDefaults.ini consistent (spacing and tabs to
 spaces)

---
 bin/OpenSimDefaults.ini | 51 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8da4daf..c090306 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -399,7 +399,6 @@
   ; ProfileURL = http://127.0.0.1:9000
 
 
-
 [SMTP]
     enabled = false
 
@@ -461,6 +460,7 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only
@@ -560,6 +560,7 @@
     ;
     ;PausedAckTimeout = 300
 
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -632,8 +633,8 @@
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
 
-	; Capability for searching for people
-	Cap_AvatarPickerSearch = "localhost"
+    ; Capability for searching for people
+    Cap_AvatarPickerSearch = "localhost"
 
     
 [Chat]
@@ -964,6 +965,7 @@
     ; Default is false.
     ;force_simple_prim_meshing = true
 
+
 [BulletSim]
     ; All the BulletSim parameters can be displayed with the console command
     ;   "physics get all" and all are defined in the source file
@@ -1279,6 +1281,7 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+
 [DataSnapshot]
     ; The following set of configs pertains to search.
     ; Set index_sims to true to enable search engines to index your searchable data
@@ -1683,31 +1686,36 @@
      RootReprioritizationDistance = 10.0
      ChildReprioritizationDistance = 20.0
 
+
 [Monitoring]
     ; Enable region monitoring
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
     ; Also is another source of region statistics provided via the regionstats URL
     Enabled = true
 
-; View region statistics via a web page
-; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
-; Use a web browser and type in the "Login URI" + "/SStats/"
-; For example- http://127.0.0.1:9000/SStats/
+
 [WebStats]
-; enabled=false
+    ; View region statistics via a web page
+    ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+    ; Use a web browser and type in the "Login URI" + "/SStats/"
+    ; For example- http://127.0.0.1:9000/SStats/
+    ; enabled=false
 
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
     Enabled = true;
 
+
 [NPC]
     ;; 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
@@ -1717,15 +1725,17 @@
     MaptileURL = "http://www.mygrid.com/Grid/"
     RefreshTime = 3600
 
+
 ;;
 ;; JsonStore module provides structured store for scripts 
 ;; 
 [JsonStore]
-Enabled = False
+    Enabled = False
+
+    ;; Enable direct access to the SOP dynamic attributes
+    EnableObjectStore = False
+    MaxStringSpace = 0
 
-;; Enable direct access to the SOP dynamic attributes
-EnableObjectStore = False
-MaxStringSpace = 0
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -1740,24 +1750,29 @@ MaxStringSpace = 0
     ; asset store each time the region starts
     AssetLoaderEnabled = true
 
+
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 	
+
 [AutoBackupModule]
-	;; default is module is disabled at the top level
-	AutoBackupModuleEnabled = false
+    ;; default is module is disabled at the top level
+    AutoBackupModuleEnabled = false
+
 
 [Sounds]
-	;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
-	Module = OpenSim.Region.CoreModules.dll:SoundModule
+    ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+    Module = OpenSim.Region.CoreModules.dll:SoundModule
+
+    ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+    MaxDistance = 100.0
 
-	;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
-	MaxDistance = 100.0
 
 [ServiceThrottle]
     ;; Default time interval (in ms) for the throttle service thread to wake up
     Interval = 5000
 
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
-- 
cgit v1.1


From acfe603a5fb2db84534f97e5f7cee3e49178279b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 15 Oct 2013 23:24:49 +0100
Subject: As discussed on many previous occasions, switch the default physics
 engine in OpenSimulator from OpenDynamicsEngine to BulletSim.

The BulletSim plugin is higher performance and has a better implementation of vehicles amongst other things.
Many thanks to Robert Adams for making this possible with the enormous amount of work that he has done on this plugin.
If you want to continue using ODE, set physics = OpenDynamicsEngine in the [Startup] section of OpenSim.ini
---
 bin/OpenSimDefaults.ini | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c090306..b56d5d1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -229,14 +229,13 @@
     ;CacheSculptMaps = true
     
     ; Choose one of the physics engines below.
-    ; OpenDynamicsEngine is by some distance the most developed physics engine.
-    ; BulletSim is a high performance, up-and-coming physics engine.
-    ; basicphysics effectively does not model physics at all, making all objects phantom.
-    physics = OpenDynamicsEngine
+    ; BulletSim is a high performance physics engine.  It is the default OpenSimulator physics engine
+    ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before
+    physics = BulletSim
+    ;physics = modified_BulletX
+    ;physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
-    ;physics = modified_BulletX
-    ;physics = BulletSim
 
     ; ##
     ; ## SCRIPT ENGINE
-- 
cgit v1.1


From 52ff860f30a16f57408d372cda9280cf71a95e3d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Nov 2013 23:27:19 +0000
Subject: minor: Make PID file examples in OpenSim and Robust config somewhat
 more meaningful than just /tmp/my.pid

---
 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 b56d5d1..ae7b794 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -21,7 +21,7 @@
     crash_dir = "crashes"
 
     ; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ; Console commands run at startup
     startup_console_commands_file = "startup_commands.txt"
-- 
cgit v1.1


From 83626e60e69ac0534faffa40f9e79a5d3ae0d332 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 20 Jan 2014 18:59:43 -0800
Subject: Adds a configuration option to cannibalize bandwidth from the udp
 texture throttle and move it to the task throttle. Since most viewers are
 using http textures, the udp texture throttle is holding onto bw that could
 be used for more responsive prims updates. See the documentation for
 CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ae7b794..0da99ba 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -539,6 +539,16 @@
     ;
     ;TextureSendLimit = 20
 
+    ; CannibalizeTextureRate allows bandwidth to be moved from the
+    ; UDP texture throttle to the task throttle. Since most viewers
+    ; use HTTP textures, this provides a means of using what is largely
+    ; unused bandwidth in the total throttle. The value is the proportion
+    ; of the texture rate to move to the task queue. It must be between
+    ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
+    ; bandwidth is grabbed)
+    ;
+    ; CannibalizeTextureRate = 0.5
+
     ; Quash and remove any light properties from attachments not on the
     ; hands. This allows flashlights and lanterns to function, but kills
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
-- 
cgit v1.1