From f473252fa8022f95f60e219b24ffa342966f8c13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 03:56:53 +0000
Subject: Add AllowRegionRestartFromClient setting to [EstateManagement]
 section of OpenSim.ini.

Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
---
 bin/OpenSimDefaults.ini | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 818321e..19e081f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -368,6 +368,12 @@
     ; alert_uri = "http://myappserver.net/my_handler/"
 
 
+[EstateManagement]
+    ; If false, then block any region restart requests from the client even if they are otherwise valid.
+    ; Default is true
+    AllowRegionRestartFromClient = true
+
+
 [SMTP]
     enabled = false
 
-- 
cgit v1.1


From edbdbd44b95b6fb11958eda1cd8e70da799849b5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 04:09:45 +0000
Subject: Enable further client stack packet pooling by default by setting
 RecycleBaseUDPPackets = true by default.

This reduces base memory churn of every client connection, improving the garbage collection situation.
The effect is a significant portion of base load (an avatar standing still on a completely blank island)
but will probably still be swallowed up by other memory use on active regions.
Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains
in case a switch back is needed.
---
 bin/OpenSimDefaults.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 19e081f..8a451ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1592,8 +1592,7 @@
 
     ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
     ; This reduces data churn
-    ; This setting is currently experimental and defaults to false.
-    RecycleBaseUDPPackets = false;
+    RecycleBaseUDPPackets = true
 
 
 [InterestManagement]
-- 
cgit v1.1


From 9b98011714110f70b6ce454594b793cd929fd27b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 24 Nov 2012 20:19:14 -0800
Subject: BulletSim: update OpenSimDefaults.ini with current default values for
 friction and collision margin. Remove some of the BulletSim parameters that
 are very esoteric and dangerous. Most of the remaining parameters are
 features one can 'see'.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8a451ec..e9bdabc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -221,10 +221,10 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
-    ; 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
-
+    ; 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
     ;physics = basicphysics
     ;physics = POS
@@ -908,15 +908,18 @@
 
 [BulletSim]
     ; World parameters
-    DefaultFriction = 0.50
+    DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
     Gravity = -9.80665
 
-    TerrainFriction = 0.50
-    TerrainHitFriction = 0.8
+    TerrainFriction = 0.30
+    TerrainHitFraction = 0.8
     TerrainRestitution = 0
+    TerrainCollisionMargin = 0.04
+
     AvatarFriction = 0.2
+    AvatarStandingFriction = 0.99
     AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleWidth = 0.6
@@ -930,27 +933,15 @@
     LinearDamping = 0.0
     AngularDamping = 0.0
     DeactivationTime = 0.2
-    LinearSleepingThreshold = 0.8
-    AngularSleepingThreshold = 1.0
-    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 = False
-    ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = True
-    ShouldSplitSimulationIslands = True
-    ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0   
+    CollisionMargin = 0.04
 
     ; Linkset constraint parameters
+    LinkImplementation = 1      ; 0=constraint, 1=compound
     LinkConstraintUseFrameOffset = False
     LinkConstraintEnableTransMotor = True
     LinkConstraintTransMotorMaxVel = 5.0
     LinkConstraintTransMotorMaxForce = 0.1
 
-
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
 
-- 
cgit v1.1


From 523213060b315c677bf3142b5d2925460a49c9ed Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 13 Dec 2012 21:02:55 +0000
Subject: Add WaitForEventCompletionOnScriptStop [XEngine] config param to
 OpenSimDefaults.ini to allow change of the wait time for an event to complete
 on script removal before aborting its thread

Default is 1000, as has previously been the case.
This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
---
 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 e9bdabc..284adfe 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1368,6 +1368,10 @@
     ; If a script overruns it's event limit, kill the script?
     KillTimedOutScripts = false
 
+    ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested
+    ; before aborting the thread (such as when an object containing scripts is taken into inventory).
+    WaitForEventCompletionOnScriptStop = 1000;
+
     ; Sets the multiplier for the scripting delays
     ScriptDelayFactor = 1.0
 
-- 
cgit v1.1


From 976023366fb42102e39467a4433066a4a68e7325 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 28 Dec 2012 16:31:45 -0800
Subject: BulletSim: update values in OpenSimDefaults.ini to reflect the values
 really used by the code.

---
 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 284adfe..74bae01 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -919,9 +919,9 @@
     TerrainCollisionMargin = 0.04
 
     AvatarFriction = 0.2
-    AvatarStandingFriction = 0.99
+    AvatarStandingFriction = 10.0
     AvatarRestitution = 0.0
-    AvatarDensity = 60.0
+    AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
     AvatarCapsuleDepth = 0.45
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From 13778c895ae8adca907781c9d8c3a9ada30814e0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 15 Jan 2013 01:44:34 -0800
Subject: BulletSim: by default, turn on continuious collision detection (CCD)
 and enable friction computation caching. Remove dangerous BulletSim settings
 from OpenSimDefaults.ini.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 74bae01..45c3d40 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -929,18 +929,10 @@
 
     MaxObjectMass = 10000.01
 
-    ; Dynamic parameters
-    LinearDamping = 0.0
-    AngularDamping = 0.0
-    DeactivationTime = 0.2
     CollisionMargin = 0.04
 
     ; Linkset constraint parameters
     LinkImplementation = 1      ; 0=constraint, 1=compound
-    LinkConstraintUseFrameOffset = False
-    LinkConstraintEnableTransMotor = True
-    LinkConstraintTransMotorMaxVel = 5.0
-    LinkConstraintTransMotorMaxForce = 0.1
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1


From 9c590e51b6a1457ccb9eaee525d1e5a244b50274 Mon Sep 17 00:00:00 2001
From: PixelTomsen
Date: Sun, 13 Jan 2013 20:18:40 +0100
Subject: IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look
 in OpenSimDefaults.ini / section [IRC]

http://opensimulator.org/mantis/view.php?id=6470

idea: https://github.com/ssm2017/IrcBridgeAlert
---
 bin/OpenSimDefaults.ini | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 45c3d40..54b88b4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1109,6 +1109,17 @@
 
     ;exclude_list=User 1,User 2,User 3
 
+    ;;Shows modal alertbox for entering agent on IRC enabled regions
+    ;;
+    ;; Enable Alert, default = false
+    ;alert_show = false
+    ;;
+    ;; Show IRC serverinfo, default = true
+    ;alert_show_serverinfo = true
+    ;;
+    ;alert_msg_pre = "This region is linked to Irc."
+    ;alert_msg_post = "Everything you say in public chat can be listened."
+
 
 ; The following settings control the progression of daytime
 ; in the Sim.  The defaults are the same as the commented out settings
-- 
cgit v1.1


From 2c517d792f0440c2705458e01a5067628b6b2c7c Mon Sep 17 00:00:00 2001
From: teravus
Date: Sun, 20 Jan 2013 08:18:16 -0500
Subject: This updates prebuild to remove BulletSimN, implements the BulletSim
 API in BulletSPlugin using the BulletXNA Bullet physics engine.  It also
 updates the BulletXNA library to be compatible with the changes.  
 OpenSimDefaults has been updated to describe how to switch engines and
 terrain implementations.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54b88b4..889865b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -908,6 +908,19 @@
 
 [BulletSim]
     ; World parameters
+
+    ; 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.
+
+    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
+
     DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
@@ -959,6 +972,7 @@
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
+    
 
 [RemoteAdmin]
     enabled = false
-- 
cgit v1.1


From c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 Jan 2013 23:57:09 +0000
Subject: Add information on ScriptStopStrategy to [XEngine] in
 OpenSimDefaults.ini and OpenSim.ini.example.  Default remains abort.

This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
co-op should be more stable but this option is experimental.
If moving from co-op to abort, existing script DLLs will need to be recompiled.
This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
---
 bin/OpenSimDefaults.ini | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 45c3d40..391fb0c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1290,6 +1290,20 @@
     ; script assemblies
     AppDomainLoading = true
 
+    ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
+    ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
+    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
+    ; by scripts have changed.
+    ; DeleteScriptsOnStartup = false
+
+    ; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 
+    ; co-op will be more stable but this option is currently experimental.
+    ; If moving from co-op to abort, existing script DLLs will need to be recompiled.
+    ; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run 
+    ; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
+    ScriptStopStrategy = abort
+
     ; Rate to poll for asynchronous command replies (ms)
     ; currently unused
     ;AsyncLLCommandLoopms = 50
@@ -1391,12 +1405,6 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
-    ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
-    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
-    ; by scripts have changed.
-    ; DeleteScriptsOnStartup = false
-
 
 [Concierge]
     ; Enable concierge module
-- 
cgit v1.1


From 9588328242f4004446b5cc08251995b8d004b4f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Feb 2013 00:59:26 +0000
Subject: Stop exceptions being thrown if GenerateMapTiles = false but no
 static map tile has been set.  Do more informative warn instead.

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

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c60579b..6ebdb96 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,6 +1,20 @@
 ; 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
-- 
cgit v1.1


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


From e93defd0ca326754d1bd5a1a503d6d47428272be Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Fri, 8 Feb 2013 15:07:43 -0800
Subject: Adds size limits to JsonStore. Adds a separate configuration variable
 to enable binding to dynamic attributes.

---
 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 7bdfd1c..2512428 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1652,6 +1652,10 @@
 [JsonStore]
 Enabled = False
 
+;; Enable direct access to the SOP dynamic attributes
+EnableObjectStore = False
+MaxStringSpace = 0
+
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
 ;; These defaults allow OpenSim to work out of the box with
-- 
cgit v1.1


From d0cb4fc3262df2afe2ef34396c7960f7afee6b89 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 25 Feb 2013 23:04:38 +0000
Subject: Move map related settings from [Startup] to a new [Map] section in
 OpenSim.ini

Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
---
 bin/OpenSimDefaults.ini | 50 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2512428..6ecb5df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -285,32 +285,6 @@
     DefaultScriptEngine = "XEngine"
 
     ; ##
-    ; ## WORLD MAP
-    ; ##
-
-    ;WorldMapModule = "WorldMap"
-    ;MapImageModule = "MapImageModule"
-
-    ; World map blacklist timeout in seconds
-    ;BlacklistTimeout = 600
-
-    ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = true
-
-    ; Refresh (in seconds) the map tile periodically
-    ;MaptileRefresh = 0
-
-    ; If not generating maptiles, use this static texture asset ID
-    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
-
-    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = true
-
-    ; ##
     ; ## EMAIL MODULE
     ; ##
 
@@ -347,6 +321,30 @@
     UseTrashOnDelete = True
 
 
+[Map]
+    ;WorldMapModule = "WorldMap"
+    ;MapImageModule = "MapImageModule"
+
+    ; World map blacklist timeout in seconds
+    ;BlacklistTimeout = 600
+
+    ; Set to false to not generate any maptiles
+    ;GenerateMaptiles = true
+
+    ; Refresh (in seconds) the map tile periodically
+    ;MaptileRefresh = 0
+
+    ; If not generating maptiles, use this static texture asset ID
+    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
+
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = true
+
+
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
     enabled = true
-- 
cgit v1.1


From 20530ee66723faa78ab8cf93c096fa4626c3c701 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 1 Mar 2013 15:24:22 -0800
Subject: Moved permissions config vars out of [Startup] into [Permissions].
 Backwards compatible ([Startup] still being looked up), but please update
 your configs sometime soon.

---
 bin/OpenSimDefaults.ini | 97 +++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ecb5df..091107f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -231,54 +231,6 @@
     ;physics = BulletSim
 
     ; ##
-    ; ## PERMISSIONS
-    ; ##
-
-    ;permissionmodules = "DefaultPermissionsModule"
-
-    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
-    ; any item, etc.  This may not yet be implemented uniformally.
-    ; If set to true, then all permissions checks are carried out
-    ; Default is true
-    serverside_object_permissions = true
-
-    allow_grid_gods = false
-
-    ; This allows somne control over permissions
-    ; please note that this still doesn't duplicate SL, and is not intended to
-    ;region_owner_is_god = true
-    ;region_manager_is_god = false
-    ;parcel_owner_is_god = true
-
-    ; Control user types that are allowed to create new scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can create scripts (subject to normal permissions)
-    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
-    ; Default value is all
-    ; allowed_script_creators = all
-
-    ; Control user types that are allowed to edit (save) scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can edit scripts (subject to normal permissions)
-    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
-    ; 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
-
-    ; Minimum user level required to upload assets
-    ;LevelUpload = 0
-
-    ; ##
     ; ## SCRIPT ENGINE
     ; ##
 
@@ -344,6 +296,55 @@
     ; Use terrain texture for maptiles if true, use shaded green if false
     TextureOnMapTile = true
 
+[Permissions]
+    ; ##
+    ; ## PERMISSIONS
+    ; ##
+
+    ;permissionmodules = "DefaultPermissionsModule"
+
+    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
+    ; any item, etc.  This may not yet be implemented uniformally.
+    ; If set to true, then all permissions checks are carried out
+    ; Default is true
+    serverside_object_permissions = true
+
+    allow_grid_gods = false
+
+    ; This allows somne control over permissions
+    ; please note that this still doesn't duplicate SL, and is not intended to
+    ;region_owner_is_god = true
+    ;region_manager_is_god = false
+    ;parcel_owner_is_god = true
+
+    ; Control user types that are allowed to create new scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can create scripts (subject to normal permissions)
+    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_creators = all
+
+    ; Control user types that are allowed to edit (save) scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can edit scripts (subject to normal permissions)
+    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
+    ; 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
+
+    ; Minimum user level required to upload assets
+    ;LevelUpload = 0
+
 
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
-- 
cgit v1.1


From b47ffb5dc40418705bb16669e47130aeddeaec6c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 2 Mar 2013 13:02:02 -0800
Subject: Added existance and default value for [XEngine]MinTimerInterval to
 OpenSimDefaults.ini

---
 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 091107f..417150a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1400,6 +1400,10 @@
     ; up the system to malicious scripters
     ; NotecardLineReadCharsMax = 255
 
+    ; Minimum settable timer interval. Any timer setting less than this is
+    ; rounded up to this minimum interval.
+    ; MinTimerInterval = 0.5
+
     ; Sensor settings
     SensorMaxRange = 96.0
     SensorMaxResults = 16
-- 
cgit v1.1


From fb1211ad5ef86bf6a1b6170775f1ebb4adcb4cb7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 12 Mar 2013 23:01:27 +0000
Subject: Add DisableInterRegionTeleportCancellation option in [EntityTransfer]
 section of OpenSim.ini.  False by default.

This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
---
 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 417150a..1d2c0cf 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -628,6 +628,11 @@
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
 
+    ; Determine whether the cancel button is shown at all during teleports.
+    ; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.)
+    ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
+    DisableInterRegionTeleportCancellation = false
+
 
 [Messaging]
     ; Control which region module is used for instant messaging.
-- 
cgit v1.1