Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 639 insertions, 183 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index dac92f0..a99608c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,7 +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).
 
-
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
@@ -10,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
@@ -22,7 +34,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"
@@ -44,14 +56,34 @@
     ; 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
     ; 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
@@ -82,22 +114,25 @@
     ;; 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
 
-    ; 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.
@@ -131,12 +166,30 @@
     ; into a restart.
     InworldRestartShutsDown = false
 
+    ; Use of normalized 55FPS statistics
+        ; Opensim does not have a frame rate control like other simulators.
+        ; Most parameters that control timing can be configurable region by region.
+        ; To achieve closer compatibility with values expected by viewers, scripts and users
+        ; some parameters are converted to a equivalent per frame value.
+        ; Additionally, they are scaled to values they would have on a system running at a nominal 55 frames per second rate.
+        ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
+        ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false.
+        ; Normalized55FPS = true
+        
     ; The minimum proportion of a second that any particular frame can take to execute.
     ; Only change this if you really know what you're doing, and be prepared to change UpdatePhysicsEveryNFrames
     ; (and other Frames params) to match!  For instance, halving MinFrameTime to 0.0445 require
     ; UpdatePhysicsEveryNFrames = 2 unless you don't mind your avatar walking like Benny Hill.
     MinFrameTime = 0.089
 
+    ; The values below represent the percentage of the target frame time that,
+    ; when underrun, should trigger yellow or red in the lag meter.
+    ; Less than 60% of FPS is amber by default, less then 40% is red.
+    ; These values are advisory. Viewers may choose to not use them but it is
+    ; encouraged that they do.
+    ; FrameTimeWarnPercent = 60;
+    ; FrameTimeCritPercent = 40;
+        
     ; Send scheduled updates to objects in the scene
     ; This must be a whole number
     UpdateObjectsEveryNFrames = 1;
@@ -157,10 +210,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;
@@ -173,6 +222,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
     ; ##
@@ -221,17 +274,114 @@
     ; 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.
-    ; 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 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
     ;physics = basicphysics
     ;physics = POS
-    ;physics = modified_BulletX
-    ;physics = BulletSim
 
     ; ##
+    ; ## SCRIPT ENGINE
+    ; ##
+
+    DefaultScriptEngine = "XEngine"
+
+    ; ##
+    ; ## EMAIL MODULE
+    ; ##
+
+    ;emailmodule = DefaultEmailModule
+
+    ; ##
+    ; ## ANIMATIONS
+    ; ##
+
+    ; If enabled, enableFlySlow will change the primary fly state to
+    ; FLYSLOW, and the "always run" state will be the regular fly.
+    enableflyslow = false
+
+    ; 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"
+
+    ; 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
+
+    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
+    ; OpenJPEG if false
+    ; UseCSJ2K = true
+
+    ; Use "Trash" folder for items deleted from the scene
+    ; When set to True (the default) items deleted from the scene will be
+    ; stored in the user's trash or lost and found folder. When set to
+    ; 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"
+    ;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
+
+    ; 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
     ; ##
 
@@ -279,74 +429,6 @@
     ; Minimum user level required to upload assets
     ;LevelUpload = 0
 
-    ; ##
-    ; ## SCRIPT ENGINE
-    ; ##
-
-    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
-    ; ##
-
-    ;emailmodule = DefaultEmailModule
-
-    ; ##
-    ; ## ANIMATIONS
-    ; ##
-
-    ; If enabled, enableFlySlow will change the primary fly state to
-    ; FLYSLOW, and the "always run" state will be the regular fly.
-    enableflyslow = false
-
-    ; 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 Stats URI
-    ; Enable JSON simulator data by setting a URI name (case sensitive)
-    ; Stats_URI = "jsonSimStats"
-
-    ; Make OpenSim start all regions woth logins disabled. They will need
-    ; to be enabled from the console if this is set
-    ; StartDisabled = false
-
-    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
-    ; OpenJPEG if false
-    ; UseCSJ2K = true
-
-    ; Use "Trash" folder for items deleted from the scene
-    ; When set to True (the default) items deleted from the scene will be
-    ; stored in the user's trash or lost and found folder. When set to
-    ; False items will be removed from the scene permanently
-    UseTrashOnDelete = True
-
 
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
@@ -374,6 +456,18 @@
     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
 
@@ -419,6 +513,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
@@ -435,6 +549,15 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+[AccessControl]
+        ; Viewer-based access control. |-separated list of allowed viewers.
+    ; AllowedClients = ""
+
+        ; Viewer-based access control. |-separated list of denied viewers. 
+        ; No restrictions by default.
+    ; DeniedClients = ""
+
+
 [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
@@ -466,14 +589,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
@@ -482,7 +612,7 @@
     enable_adaptive_throttles = true
 
     ; 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
 
@@ -514,6 +644,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
@@ -534,6 +674,7 @@
     ;
     ;PausedAckTimeout = 300
 
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -542,7 +683,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
@@ -554,7 +694,7 @@
     Cap_ObjectMediaNavigate = "localhost"
     Cap_FetchLib = ""
     Cap_FetchLibDescendents = ""
-    Cap_GetDisplayNames = ""
+    Cap_GetDisplayNames = "localhost"
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
     Cap_GetObjectCost = ""
@@ -606,8 +746,11 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
-    
 
+    ; Capability for searching for people
+    Cap_AvatarPickerSearch = "localhost"
+
+    
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -621,11 +764,25 @@
     ; Distance in meters that shouts should travel.  Default is 100m
     shout_distance = 100
 
-
 [EntityTransfer]
+    ; The maximum distance in regions that an agent is allowed to teleport 
+    ; 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 = 65535
+
+    ; Allow avatars to cross into and out of the region.
+    AllowAvatarCrossing = true
+
     ; 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.
@@ -666,7 +823,11 @@
     ; 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
+    ReuseTextures = false
 
 
 [Attachments]
@@ -674,6 +835,12 @@
     ; 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/change outfit
+    ; or when multiple avatars with medium level attachments login/change outfit simultaneously.
+    ; If 0 then no throttling is performed.
+    ThrottlePer100PrimsRezzed = 0;
+
 
 [Mesh]
     ; enable / disable Collada mesh support
@@ -888,81 +1055,106 @@
     ; ## 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]
-    ; World parameters
-    DefaultFriction = 0.20
-    DefaultDensity = 10.000006836
-    DefaultRestitution = 0.0
-    Gravity = -9.80665
-
-    TerrainFriction = 0.30
-    TerrainHitFraction = 0.8
-    TerrainRestitution = 0
-    TerrainCollisionMargin = 0.04
-
-    AvatarFriction = 0.2
-    AvatarStandingFriction = 10.0
-    AvatarRestitution = 0.0
-    AvatarDensity = 3.5
-    AvatarCapsuleWidth = 0.6
-    AvatarCapsuleDepth = 0.45
-    AvatarCapsuleHeight = 1.5
-    AvatarContactProcessingThreshold = 0.1
-
-    MaxObjectMass = 10000.01
-
-    ; Dynamic parameters
-    LinearDamping = 0.0
-    AngularDamping = 0.0
-    DeactivationTime = 0.2
-    CollisionMargin = 0.04
-
-    ; Linkset constraint 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
+    ;   but the c++ one is much faster.
+    BulletEngine = "bulletunmanaged"
+    ; BulletEngine = "bulletxna"
+
+    ; BulletSim can run on its own thread independent of the simulator's heartbeat
+    ;   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 = 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
+    ;   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      ; 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'
+    ;    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
-    LinkConstraintUseFrameOffset = False
-    LinkConstraintEnableTransMotor = True
-    LinkConstraintTransMotorMaxVel = 5.0
-    LinkConstraintTransMotorMaxForce = 0.1
 
-    ; Whether to mesh sculpties
+    ; 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.
     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
+    ; 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
 
-    ; Bullet step parameters
-    MaxSubSteps = 10
-    FixedTimeStep = .01667
+    ; 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
+    
 
 [RemoteAdmin]
     enabled = false
@@ -1113,6 +1305,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
@@ -1193,6 +1396,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
@@ -1204,6 +1412,177 @@
     ; 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.
     ; Set index_sims to true to enable search engines to index your searchable data
@@ -1217,7 +1596,7 @@
     data_exposure = minimum
 
     ; If search is on, change this to your grid name; will be ignored for standalones
-    gridname = "InfiniteGrid"
+    gridname = "OSGrid"
 
     ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
     ; Later, you may want to increase this to 3600 (1 hour) or more
@@ -1226,9 +1605,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]
@@ -1294,6 +1673,21 @@
     ; 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 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
     ;AsyncLLCommandLoopms = 50
@@ -1304,8 +1698,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
 
@@ -1379,6 +1773,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
@@ -1395,12 +1793,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
@@ -1536,9 +1928,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
@@ -1550,7 +1945,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
-    ; This currently only applies to the Flotsam XmlRpc backend
+    ; (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
@@ -1587,14 +1982,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
@@ -1602,24 +2015,48 @@
     ; 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
 
+[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
     Enabled = true;
 
+
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+
 [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
@@ -1630,11 +2067,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
+
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -1649,20 +2092,33 @@ Enabled = False
     ; 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
+
+[Dwell]
+    ;; This enables the built in basic dwell module
+    DwellModule = DefaultDwellModule
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
+