1 files changed, 382 insertions, 57 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 911dc90..05ea867 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -9,6 +9,19 @@
     ; \\ - substtitue \
     ConsolePrompt = "Region (\R) "
 
+    ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
+    ConsoleHistoryFileEnabled = true
+
+    ; Log file location. This can be set to a simple file path
+    ; LogFile = OpenSim.log
+
+    ; The history file can be just a filename (relative to OpenSim's bin/ directory
+    ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/)
+    ConsoleHistoryFile = "OpenSimConsoleHistory.txt"
+
+    ; How many lines of command history should we keep? (default is 100)
+    ConsoleHistoryFileLines = 100
+
     ; Set this to true if you want to log crashes to disk
     ; this can be useful when submitting bug reports.
     ; However, this will only log crashes within OpenSimulator that cause the entire program to exit
@@ -55,7 +68,22 @@
 
     ; Max threads to allocate on the FireAndForget thread pool
     ; when running with the SmartThreadPool option above
-    MaxPoolThreads = 15
+    MaxPoolThreads = 300
+
+    ; Allow certain jobs to be run consecutively in a job engine rather than always concurrently.
+    ; This improves performance in regions with large numbers of connections (in the hundreds).
+    JobEngineEnabled = true
+
+    ; Plugin Registry Location
+    ; Set path to directory for plugin registry. Information about the 
+    ; registered repositories and installed plugins will be stored here.
+    ; The OpenSim.exe process must have R/W access to the location.
+    RegistryLocation = "."
+
+    ; Used by region module addins. You can set this to outside bin, so that addin
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access 
+    ; to the location.
+    ConfigDirectory = "."
 
     ; ##
     ; ## CLIENTS
@@ -93,18 +121,18 @@
     ; Increasing this number will increase memory usage.
     MaxPrimUndos = 20
 
-    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
+    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
-    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
-    PhysicalPrimMax = 10
+    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file.
+    PhysicalPrimMax = 64
 
     ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
-    ; This can be overriden in the region config file.
+    ; This can be overridden in the region config file.
     ClampPrimSize = false
-        
+
     ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
-    ; This can be overriden in the region config file.
+    ; This can be overridden in the region config file.
     LinksetPrims = 0
 
     ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.
@@ -164,10 +192,6 @@
     ; This must be a whole number
     UpdatePhysicsEveryNFrames = 1;
 
-    ; Clean up temp on rez objects.
-    ; This must be a whole number
-    UpdateTempCleaningEveryNFrames = 1000;
-
     ; Send out the on frame event to modules and other listeners.  This should probably never deviate from 1.
     ; This must be a whole number
     UpdateEventsEveryNFrames = 1;
@@ -180,6 +204,10 @@
     ; This must be a whole number
     UpdateStorageEveryNFrames = 200;
 
+    ; Clean up temp on rez objects.
+    ; This must be a whole number
+    UpdateTempCleaningEveryNSeconds = 180;
+
     ; ##
     ; ## PRIM STORAGE
     ; ##
@@ -228,9 +256,12 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
-    ; Choose one of the physics engines below.
-    ; 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
+    ;; BulletSim is the default physics engine.  It provides the best performance and most functionality.
+    ;; BulletSim supports varregions.
+    ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before.  
+    ;; It continues to provide a workable physics implementation.  It does not currently support varregions.
+    ;; basicphysics effectively does not model physics at all, making all objects phantom.   
+    ;; Default is OpenDynamicsEngine
     physics = BulletSim
     ;physics = modified_BulletX
     ;physics = OpenDynamicsEngine
@@ -260,11 +291,15 @@
     ; PreJump is an additional animation state, but it probably
     ; won't look right until the physics engine supports it
     ; (i.e delays takeoff for a moment)
+    
+    ; Simulator statistics are output to the console periodically at debug level INFO.
+    ; Setting this to zero disables this output.
+    ; LogShowStatsSeconds = 3600
 
     ; Simulator Stats URI
     ; Enable JSON simulator data by setting a URI name (case sensitive)
     ; Returns regular sim stats (SimFPS, ...)
-    ; Stats_URI = "jsonSimStats"
+    Stats_URI = "jsonSimStats"
 
     ; Simulator StatsManager URI
     ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally
@@ -286,6 +321,14 @@
     ; False items will be removed from the scene permanently
     UseTrashOnDelete = True
 
+    ; #
+    ; # Logging
+    ; #
+
+    ; Force logging when the thread pool approaches an overload condition
+    ; Provides useful data for post-mortem analysis even in a production
+    ; system with reduced logging
+    LogOverloads = True
 
 [Map]
     ;WorldMapModule = "WorldMap"
@@ -310,6 +353,15 @@
     ; Use terrain texture for maptiles if true, use shaded green if false
     TextureOnMapTile = true
 
+    ; Texture prims
+    TexturePrims = true
+
+    ; Only texture prims that have a diagonal size greater than this number
+    TexturePrimSize = 48
+
+    ; Attempt to render meshes and sculpties on the map
+    RenderMeshes = false;
+
 [Permissions]
     ; ##
     ; ## PERMISSIONS
@@ -443,6 +495,26 @@
     ; (on Windows this mean NETBIOS name - useably only inside local network)
     ; ExternalHostNameForLSL=127.0.0.1
 
+    ; Disallow the following address ranges for user scripting calls (e.g. llHttpRequest())
+    ; This is based on http://en.wikipedia.org/wiki/Reserved_IP_addresses
+    ; This stops users making HTTP calls to machines in the simulator's local network.
+    ; If you need to allow some LAN calls we recommend you use OutboundDisallowForUserScriptsExcept documented in OpenSim.ini.example
+    ; If you override OutboundDisallowForUserScripts directly you need to be very careful.
+    ;
+    ; Network ranges are specified in CIDR notation (http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation) with multiple entries separated by |
+    ; To specify an individual IP address use the /32 netmask (e.g. 192.168.1.3/32)
+    ; You can also specify individual <addr>:<port> endpoints (e.g. 192.168.1.3:8003)
+    ; If an address if given without a port number then port 80 is assumed.
+    OutboundDisallowForUserScripts = 0.0.0.0/8|10.0.0.0/8|100.64.0.0/10|127.0.0.0/8|169.254.0.0/16|172.16.0.0/12|192.0.0.0/24|192.0.2.0/24|192.88.99.0/24|192.168.0.0/16|198.18.0.0/15|198.51.100.0/24|203.0.113.0/24|224.0.0.0/4|240.0.0.0/4|255.255.255.255/32
+    ;
+    ; You can also prevent all user script outgoing calls with the following override in OpenSim.ini
+    ;
+    ; OutboundDisallowForUserScripts = 0.0.0.0/0
+    ;
+    ; You can also disable the blacklist entirely with an empty entry
+    ;
+    ; OutboundDisallowForUserScripts = ""
+  
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
     ; The old default is "OpenSim", set here for compatibility
@@ -491,14 +563,21 @@
     ; 0, meaning no throttling at the scene level. The example given here is
     ; 20 megabits
     ;
-    ;scene_throttle_max_bps = 2621440
+    ;scene_throttle_max_bps = 2500000
 
-    ; Maximum bits per second to send to any single client. This will override
+    ; Maximum bytes per second to send to any single client. This will override
     ; the user's viewer preference settings. The default value is 0, meaning no
     ; aggregate throttling on clients (only per-category throttling). The
     ; example given here is 1.5 megabits
     ;
-    ;client_throttle_max_bps = 196608
+    ;client_throttle_max_bps = 187500
+
+    ; Minimum bytes per second to send to any single client as a result of
+    ; adaptive throttling. Viewer preferences set to a lower number will 
+    ; override the settin. The example given here ensures that adaptive
+    ; throttling will never decrease per client bandwidth below 256 kbps.
+    ;
+    ;adaptive_throttle_min_bps = 32000
 
     ; Adaptive throttling attempts to limit network overload when multiple
     ; clients login by starting each connection more slowly. Disabled by
@@ -507,7 +586,7 @@
     enable_adaptive_throttles = false
 
     ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overriden by clients. These
+    ; These are default values that will be overridden by clients. These
     ; defaults are approximately equivalent to the throttles set by the Imprudence
     ; viewer when maximum bandwidth is set to 350kbps
 
@@ -589,7 +668,7 @@
     Cap_ObjectMediaNavigate = "localhost"
     Cap_FetchLib = ""
     Cap_FetchLibDescendents = ""
-    Cap_GetDisplayNames = ""
+    Cap_GetDisplayNames = "localhost"
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
     Cap_GetObjectCost = ""
@@ -663,19 +742,26 @@
 [EntityTransfer]
     ; The maximum protocol version that we will use for outgoing transfers
     ; Valid values are 
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
     ; "SIMULATION/0.2"
-    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - 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"
+    MaxOutgoingTransferVersion = "SIMULATION/0.3"
 
     ; 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 
+    ; along the x or y axis. This is set to 65535 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
+    max_distance = 65535
+
+    ; Allow avatars to cross into and out of the region.
+    AllowAvatarCrossing = true
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
@@ -725,7 +811,7 @@
     ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
     ; This may help with some situations where avatars are persistently grey, though it will not help 
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
-    ResendAppearanceUpdates = true
+    ResendAppearanceUpdates = false
 
     ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar 
     ; on every login
@@ -987,22 +1073,41 @@
     ; BulletEngine = "bulletxna"
 
     ; 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.
+    ;   thread. Enabling this will not 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
+    TerrainImplementation = 0
     ; 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.
+    ;   magnifications use lots of memory.
     TerrainMeshMagnification = 2
 
+    ; Should avatars collide with each other?
+    AvatarToAvatarCollisionsByDefault = true
+
     ; 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
+    AvatarHeightLowFudge = 0      ; Adjustment at low end of height range
+    AvatarHeightMidFudge = 0      ; Adjustment at mid point of avatar height range
+    AvatarHeightHighFudge = 0     ; Adjustment at high end of height range
+
+    ; Avatar walk-up-stairs parameters
+    ; If an avatar collides with an object 'close to its feet', the avatar will be
+    ;    moved/pushed up do simulate stepping up.
+    ;AvatarStepHeight = 0.6f             ; The height, below which is considered a step collision.
+    ;AvatarStepAngle = 0.3f              ; The angle from vertical (in radians) to consider a surface a step
+    ;AvatarStepApproachFactor = 2f       ; Approach angle factor. O=straight on, .6=~45 degrees.
+    ;AvatarStepGroundFudge = 0.1f        ; Fudge added to bottom of avatar below which step collisions happen
+    ;AvatarStepForceFactor = 0f          ; Avatar is pushed up by its mass times this factor
+    ;AvatarStepUpCorrectionFactor = 0.8f ; Avatar is displaced up the collision height times this factor
+    ;AvatarStepSmoothingSteps = 1        ; Number of frames after a step collision that up correction is applied
+
+    ; Terminal velocity of a falling avatar
+    ; This is the same http://en.wikipedia.org/wiki/Terminal_velocity#Examples
+    ; negative for a downward speed.
+    AvatarTerminalVelocity = -54
 
     ; Default linkset implmentation
     ; 'Constraint' uses physics constraints to hold linkset together. 'Compound'
@@ -1010,8 +1115,8 @@
     ;    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', offset a linkset's origin based on mass of linkset parts.
+    LinksetOffsetCenterOfMass = false
 
     ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
@@ -1279,6 +1384,11 @@
     ; If false then gods cannot execute these functions either.
     AllowGodFunctions = false
 
+    ; Restrict the email address used by llEmail to the address associated with the avatars user account?
+    ; If true then llEmail will only send email to the address in the user account of the avatar who owns the object containing the script.
+    ; If false then email may be sent to any valid email address.
+    RestrictEmail = false
+
     ; Maximum number of llListen events we allow over the entire region.
     ; Set this to 0 to have no limit imposed
     max_listens_per_region = 1000
@@ -1290,6 +1400,176 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+    ; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes.
+    ; Speeds up calculations but can make them inaccurate, in some cases very inaccurate.
+    UseSimpleBoxesInGetBoundingBox = false
+
+    ; Add a third vector with stats when returning results from llGetBoundingBox.
+    ; Lists objects (groups), prims/meshes/avatars (parts) and vertices rendered.
+    AddStatsInGetBoundingBox = false
+
+    ; Avatar bounding box, lower X value, constant part, when standing
+    LowerAvatarBoundingBoxStandingXconst = -0.275
+
+    ; Avatar bounding box, upper X value, constant part, when standing
+    UpperAvatarBoundingBoxStandingXconst = 0.275
+
+    ; Avatar bounding box, lower Y value, constant part, when standing
+    LowerAvatarBoundingBoxStandingYconst = -0.35
+
+    ; Avatar bounding box, upper Y value, constant part, when standing
+    UpperAvatarBoundingBoxStandingYconst = 0.35
+
+    ; Avatar bounding box, lower Z value, constant part, when standing
+    LowerAvatarBoundingBoxStandingZconst = -0.1
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when standing
+    LowerAvatarBoundingBoxStandingZcoeff = -0.5
+
+    ; Avatar bounding box, upper Z value, constant part, when standing
+    UpperAvatarBoundingBoxStandingZconst = 0.1
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when standing
+    UpperAvatarBoundingBoxStandingZcoeff = 0.5
+
+    ; Avatar bounding box, lower X value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingXconst = -0.3875
+
+    ; Avatar bounding box, upper X value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingXconst = 0.3875
+
+    ; Avatar bounding box, lower Y value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingYconst = -0.5
+
+    ; Avatar bounding box, upper Y value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingYconst = 0.5
+
+    ; Avatar bounding box, lower Z value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingZconst = -0.05
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingZcoeff = -0.375
+
+    ; Avatar bounding box, upper Z value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingZconst = 0.5
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingZcoeff = 0.0
+
+    ; Avatar bounding box, lower X value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingXconst = -0.5875
+
+    ; Avatar bounding box, upper X value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingXconst = 0.1875
+
+    ; Avatar bounding box, lower Y value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingYconst = -0.35
+
+    ; Avatar bounding box, upper Y value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingYconst = 0.35
+
+    ; Avatar bounding box, lower Z value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingZconst = -0.35
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when sitting
+    LowerAvatarBoundingBoxSittingZcoeff = -0.375
+
+    ; Avatar bounding box, upper Z value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingZconst = -0.25
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when sitting
+    UpperAvatarBoundingBoxSittingZcoeff = 0.25
+
+    ; Safety coefficient for max bounding box from prim size box X coordinate
+    ; Worst case is twisted and sheared box, 1+sqrt(2)
+    PrimBoundingBoxSafetyCoefficientX = 2.414214
+
+    ; Safety coefficient for max bounding box from prim size box Y coordinate
+    ; Worst case is twisted and sheared box, 1+sqrt(2)
+    PrimBoundingBoxSafetyCoefficientY = 2.414214
+
+    ; Safety coefficient for max bounding box from prim size box Z coordinate
+    ; Worst case is twisted tube, 0.5+sqrt(1.25)
+    PrimBoundingBoxSafetyCoefficientZ = 1.618034
+
+    ; Use llCastRay V3 if true.
+    ; Implements llCastRay similar but not identical to Second Life.
+    ; See http://wiki.secondlife.com/wiki/LlCastRay .
+    ; NEW
+    ; Meshes prims for good accuracy in ray hit detection,
+    ; handling basic and tortured prims, sculpts and meshes.
+    ; Uses ellipsoid, correctly sized avatar capsules.
+    ; Handles complex terrain, multi-prim objects and seated avatars.
+    ; Implements throttling and the status codes
+    ; RCERR_UNKNOWN and RCERR_CAST_TIME_EXCEEDED,
+    ; so LSL scripts need to handle these responses and RCERR_SIM_PERF_LOW.
+    ; WARNING
+    ; Can be faster on some servers and scenes, but slower on others,
+    ; compared to previous version of llCastRay in OpenSimulator.
+    ; Is in most cases considerably slower than llCastRay in Second Life.
+    ; Generates geometry meshes and can therefore use much system resources.
+    UseLlCastRayV3 = false
+
+    ; Accepted calculation precision error in calculations in llCastRay V3
+    FloatToleranceInLlCastRay = 0.00001
+
+    ; Accepted distance difference between duplicate hits in llCastRay V3
+    FloatTolerance2InLlCastRay = 0.001
+
+    ; Detail level when rendering prims in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    PrimDetailLevelInLlCastRay = 1
+
+    ; Detail level when rendering sculpts in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    SculptDetailLevelInLlCastRay = 1
+
+    ; Detail level when rendering meshes in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    MeshDetailLevelInLlCastRay = 3
+
+    ; Detail level when rendering avatar capsules in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    AvatarDetailLevelInLlCastRay = 1
+
+    ; Maximum number of returned hits from llCastRay V3
+    MaxHitsInLlCastRay = 16
+
+    ; Maximum number of returned hits per prim from llCastRay V3
+    MaxHitsPerPrimInLlCastRay = 16
+
+    ; Maximum number of returned hits per object from llCastRay V3
+    MaxHitsPerObjectInLlCastRay = 16
+
+    ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay V3 if true
+    DetectExitHitsInLlCastRay = false
+
+    ; Filter on parts instead of groups in llCastRay V3 if true
+    FilterPartsInLlCastRay = false
+
+    ; Detect attachments in llCastRay V3 if true
+    DoAttachmentsInLlCastRay = false
+
+    ; Throttle period length in ms before which all old llCastRay use is discarded in llCastRay V3
+    ; The sum of AvailableTimeInMsPerRegionInLlCastRay and all AvailableTimeInMsPerAvatarInLlCastRay should not exceed this
+    ThrottleTimeInMsInLlCastRay = 200
+
+    ; Available time in ms for llCastRay per throttle period and 65536 m2 land area in llCastRay V3
+    AvailableTimeInMsPerRegionInLlCastRay = 40
+
+    ; Available time in ms for llCastRay per throttle period and avatar when script in attachment or vehicle in llCastRay V3
+    AvailableTimeInMsPerAvatarInLlCastRay = 10
+
+    ; Required available time in ms left to perform a new llCastRay in llCastRay V3
+    RequiredAvailableTimeInMsInLlCastRay = 2
+
+    ; Maximum available time in ms possible in llCastRay V3, not to get too high values with varregions
+    MaximumAvailableTimeInMsInLlCastRay = 40
+
+    ; Use cached meshes in llCastRay V3 if true
+    ; Improves performance but uses more memory
+    UseMeshCacheInLlCastRay = true
+
 
 [DataSnapshot]
     ; The following set of configs pertains to search.
@@ -1313,9 +1593,9 @@
     ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
     snapshot_cache_directory = "DataSnapshot"
 
-    ; This semicolon-separated string serves to notify specific data services about the existence
-    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
-    ;data_services="http://metaverseink.com/cgi-bin/register.py"
+    ; Uncomment if you want to index your data with this and/or other search providers. One entry per
+    ; data service
+    ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 
 [Economy]
@@ -1387,13 +1667,14 @@
     ; 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
+    ; Controls whether scripts are stopped by aborting their threads externally (abort) 
+    ; or by co-operative checks inserted by OpenSimulator into compiled script (co-op).
+    ; co-op will be more stable as aborting threads can cause instability.
+    ; abort was the default option in OpenSimulator 0.8 and before.
+    ; If this setting is changed between co-op and abort, then existing scripts will automatically be recompiled if necessary.
+    ; However, the setting change will not take affect until the next time you restart the simulator.
+    ; Setting changes will not affect state information stored for scripts.
+    ScriptStopStrategy = co-op
 
     ; Rate to poll for asynchronous command replies (ms)
     ; currently unused
@@ -1405,8 +1686,8 @@
     ; Default language for scripts
     DefaultCompileLanguage = lsl
 
-    ; List of allowed languages (lsl,vb,js,cs)
-    ; AllowedCompilers=lsl,cs,js,vb.
+    ; List of allowed languages (lsl,vb,cs)
+    ; AllowedCompilers=lsl,cs,vb
     ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
     AllowedCompilers=lsl
 
@@ -1635,9 +1916,12 @@
     ; Enable Group Notices
     ;NoticesEnabled   = true 
 
-    ; This makes the Groups modules very chatty on the console.
+    ; This makes the Group module very chatty on the console.
     DebugEnabled     = false
 
+    ; This makes the Groups Messaging module very chatty on the console.
+    DebugMessagingEnabled = false
+
     ; Groups data is cached for this number of seconds before another request is made to the groups service
     ; Set to 0 to disable the cache.
     ; Default is 30 seconds
@@ -1649,7 +1933,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)
+    ; (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
@@ -1686,15 +1970,32 @@
 
 
 [InterestManagement]
-     ; This section controls how state updates are prioritized for each client
-     ; Valid values are BestAvatarResponsiveness, Time, Distance,
-     ; SimpleAngularDistance, and FrontBack
-     UpdatePrioritizationScheme = BestAvatarResponsiveness
-     ReprioritizationEnabled = true
-     ReprioritizationInterval = 2000.0
-     RootReprioritizationDistance = 10.0
-     ChildReprioritizationDistance = 20.0
+    ; This section controls how state updates are prioritized for each client
+    ; Valid values are BestAvatarResponsiveness, Time, Distance,
+    ; SimpleAngularDistance, and FrontBack
+    UpdatePrioritizationScheme = BestAvatarResponsiveness
+    ReprioritizationEnabled = true
+    ReprioritizationInterval = 2000.0
+    RootReprioritizationDistance = 10.0
+    ChildReprioritizationDistance = 20.0
+
+    ; If n > 1, only every n UDP terse updates will be sent to observers of an avatar that are in the same region
+    ; Updates will always be sent to the avatar that the update addresses and if av velocity is effectively zero (to prevent drift due to missing updates).
+    ; n > 1 will reduce UDP traffic but will lead to laggier movement observed in other avatars.
+    RootTerseUpdatePeriod = 0
+
+    ; If n > 1, only every n UDP terse updates will be sent to observers of an avatar that are in another region
+    ; n > 1 will reduce UDP traffic but may lead to laggier movement observed in other avatars, though values up to 4 may not generate a noticeable effect.
+    ChildTerseUpdatePeriod = 0
+    
+    ; Send an update to clients if the difference from the last sent avatar position is greater than this tolerance
+    RootPositionUpdateTolerance = 0.05
+
+    ; Send an update to clients if the euclidian difference from the last sent avatar rotation is greater than this tolerance
+    RootRotationUpdateTolerance = 0.1
 
+    ; Send an update to clients if the difference from the last sent avatar velocity is greater than this tolerance
+    RootVelocityUpdateTolerance = 0.001
 
 [Monitoring]
     ; Enable region monitoring
@@ -1710,6 +2011,10 @@
     ; For example- http://127.0.0.1:9000/SStats/
     ; enabled=false
 
+[Statistics]
+        ; NumberOfFrames is used in a moving average calculation, where NumberOfFrames is the number of frames 
+        ; to include in the averaging calculations
+        NumberOfFrames=10
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
@@ -1722,8 +2027,24 @@
 
 
 [Terrain]
+    ; Values can be "pinhead-island" or "flat"
     InitialTerrain = "pinhead-island"
-
+    ; If 'true' each avatar is only sent terrain patches within their view distance
+    ; This also changes the region terrain loading from 'lawn mower' to ordered around
+    ;     the avatar outward.
+    SendTerrainUpdatesByViewDistance = True
+
+[LandManagement]
+    ; When editing terrain or objects, parcel layer info is updated in the viewer.
+    ;   This can be expensive for large regions. If this variable is 'true', only the
+    ;   parcel layer data around the area of interest is sent. The parcel layer info
+    ;   is sent for 'ParcelLayerViewDistance' around the interest point.
+    ; If 'ParcelLayerViewDistance' is >= 128, the operation for legacy sized regions
+    ;   will be what it has always been (send the whole region's parcel layer info).
+    ; Other parcel updates (login, changing parcel ownership, ...) will still send
+    ;   whole region.
+    LimitParcelLayerUpdateDistance = true
+    ParcelLayerViewDistance = 128
 
 ;; 
 ;; If you are using a simian grid frontend you can enable
@@ -1763,7 +2084,7 @@
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-        
+
 
 [AutoBackupModule]
     ;; default is module is disabled at the top level
@@ -1782,6 +2103,10 @@
     ;; Default time interval (in ms) for the throttle service thread to wake up
     Interval = 5000
 
+[Dwell]
+    ;; This enables the built in basic dwell module
+    DwellModule = DefaultDwellModule
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
+