1 files changed, 753 insertions, 372 deletions

diff --git a/config/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 12ca68f..a42c831 100644
--- a/config/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -4,13 +4,13 @@
 
 [Includes]
     ; Define your server specific constants in this file.
-    Include-Common = config.ini
+    Include-Common = ../../config/config.ini
 
 
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
-    ; Currently, these are 
+    ; Currently, these are
     ; \R - substitute region name
     ; \\ - substtitue \
     ConsolePrompt = "Region (\R) "
@@ -19,11 +19,11 @@
     ConsoleHistoryFileEnabled = true
 
     ; Log file location. This can be set to a simple file path
-    ; LogFile = "../logs/OpenSim.log
+    LogFile = "${Paths|LogPath}/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"
+    ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory.txt"
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
@@ -67,7 +67,7 @@
     ; 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 
+    ; 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
@@ -81,13 +81,13 @@
     JobEngineEnabled = true
 
     ; Plugin Registry Location
-    ; Set path to directory for plugin registry. Information about the 
+    ; 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 
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access
     ; to the location.
     ConfigDirectory = "."
 
@@ -109,12 +109,12 @@
 
     ; Determines where the region XML files are stored if you are loading these from the filesystem.
     ; Defaults to bin/Regions in your OpenSimulator installation directory
-    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
+    regionload_regionsdir="Regions"
 
     ; Determines the page from which regions xml is retrieved if you are loading these from the web
     ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
     ; except that everything is also enclosed in a <Regions> tag.
-    ; regionload_webserver_url = "http://example.com/regions.xml";
+    ; regionload_webserver_url = "http://example.com/regions.xml"
 
     ;; Allow the simulator to start up if there are no region configuration available
     ;; from the selected region_info_source.
@@ -123,22 +123,25 @@
     ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
     see_into_region = false
 
+    ;; use legacy math for sittarget offset "correction"
+    ;; set this option to false to use improved math more compatibility with SL.
+    ;; keep it true if you have many old objects with sits set by scripts.
+    ;; the offset in question is added to the SitTarget to find the sitting avatar position.
+    ;; acording to its size, etc.
+    LegacySitOffsets = false
+
     ; 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
 
-    ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001
-    ;; Minimum size for non-physical prims.  Affects resizing of existing 
-    ;; prims.  This can be overridden in the region config file (as 
-    ;; NonPhysicalPrimMin!).
+    ; Minimum size for non-physical prims.This can be overridden in the region config file (as
+    ; NonPhysicalPrimMin!).
     ; NonPhysicalPrimMin = 0.001
 
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 2560
 
-    ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01
-    ;; Minimum size where a prim can be physical.  Affects resizing of
-    ;; existing prims.  This can be overridden in the region config file.
+    ; Minimum size where a prim can be physical. This can be overridden in the region config file.
     ; PhysicalPrimMin = 0.01
 
     ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file.
@@ -148,12 +151,15 @@
     ; This can be overridden in the region config file.
     ClampPrimSize = false
 
+    ; If a prim is loaded from an external source, clamp it to Z = 0 if Z is negative.
+    ClampNegativeZ = false
+
     ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
     ; 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.
-    ; This only applies when crossing to a region running in a different simulator.  
+    ; This only applies when crossing to a region running in a different simulator.
     ; For crossings where the regions are on the same simulator the script is always kept running.
     AllowScriptCrossing = true
 
@@ -163,17 +169,18 @@
     ; YOU HAVE BEEN WARNED!!!
     TrustBinaries = false
 
-    ; Combine all contiguous regions into one large megaregion
-    ; Order your regions from South to North, West to East in your regions.ini and then set this to true
-    ; Warning!  Don't use this with regions that have existing content!, This will likely break them
-    CombineContiguousRegions = false
+    ; the default view range. Viewers override this ( no major effect still )
+    DefaultDrawDistance = 1024.0
+
+    ; limit the maximum view range ( no effect still (does limit MaxRegionsViewDistance) )
+    MaxDrawDistance = 1024
 
-    ; Extend the region's draw distance; 255m is the default which includes
-    ; one neighbor on each side of the current region, 767m would go three
-    ; neighbors on each side for a total of 49 regions in view. Warning, unless
-    ; all the regions have the same drawdistance, you will end up with strange
-    ; effects because the agents that get closed may be inconsistent.
-    DefaultDrawDistance = 767.0
+    ; the maximum distance to tell a viewer to connect to a neighbour region, so it can be seen
+    ; (it is limited by MaxDrawDistance above)
+    ; less than 256 shows imediate neighbours; 512 also second imediate neighbours etc
+    ; more than 512m can cause viewers problems specially in case of dense regions.
+    ; curretly this distance is from current region borders.
+    MaxRegionsViewDistance = 1024
 
     ; If you have only one region in an instance, or to avoid the many bugs
     ; that you can trigger in modules by restarting a region, set this to
@@ -193,55 +200,58 @@
     ; 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
+    ; Main Frame time
+    ; This defines the rate of several simulation events.
+    ; Default value should meet most needs.
+    ; It can be reduced to improve the simulation of moving objects, with possible increase of cpu and network loads.
+    ; It should not be less than the physics engine step time.
+    ; Being a integer multiple of it may reduce some jitter in reported physics FPS.
+    ; changing this value, you need to change some of the following *EveryNFrames so their actions timing remains the same
+    FrameTime = 0.0909
 
     ; 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;
+    ; FrameTimeWarnPercent = 60
+    ; FrameTimeCritPercent = 40
 
     ; Send scheduled updates to objects in the scene
     ; This must be a whole number
-    UpdateObjectsEveryNFrames = 1;
+    UpdateObjectsEveryNFrames = 1
 
     ; Send position/velocity, etc. updates to agents in the scene
     ; This must be a whole number
-    UpdateAgentsEveryNFrames = 1;
+    UpdateAgentsEveryNFrames = 1
 
     ; Apply pending forces from physics calculations to an entity.
     ; This must be a whole number
-    UpdateEntityMovementEveryNFrames = 1;
+    UpdateEntityMovementEveryNFrames = 1
 
     ; Send coarse location updates to viewers.  In a classic viewer, this updates the minimap.
     ; This must be a whole number
-    UpdateCoarseLocationsEveryNFrames = 50;
+    UpdateCoarseLocationsEveryNFrames = 50
 
-    ; Update physics.  Within each update physics also updates in a series of contigous mini-steps
+    ; Physics simulation execution or syncronization, acording to engine. Should be 1
     ; This must be a whole number
-    UpdatePhysicsEveryNFrames = 1;
+    UpdatePhysicsEveryNFrames = 1
 
     ; 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;
+    UpdateEventsEveryNFrames = 1
 
     ; Send terrain updates to viewers
     ; This must be a whole number
-    UpdateTerrainEveryNFrames = 50; 
+    UpdateTerrainEveryNFrames = 50
 
     ; Persitently store any objects which meet the PRIM STORAGE criteria
     ; This must be a whole number
-    UpdateStorageEveryNFrames = 200;
+    UpdateStorageEveryNFrames = 200
 
     ; Clean up temp on rez objects.
     ; This must be a whole number
-    UpdateTempCleaningEveryNSeconds = 180;
+    UpdateTempCleaningEveryNSeconds = 180
 
     ; ##
     ; ## PRIM STORAGE
@@ -277,8 +287,14 @@
     ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
     ; Usually this is only a box
 
-    meshing = Meshmerizer
+    ;meshing = Meshmerizer
     ;meshing = ZeroMesher
+    ;; select ubODEMeshmerizer only with ubOde physics engine
+    meshing = ubODEMeshmerizer
+
+    ; ubODE and  OpenDynamicsEngine does allocate a lot of memory on stack. On linux you may need to increase its limit
+    ; script opensim-ode-sh starts opensim setting that limit. You may need to increase it even more on large regions
+    ; edit the line ulimit -s 262144, and change this last value
 
     ; Path to decoded sculpty maps
     ; Defaults to "j2kDecodeCache
@@ -293,26 +309,41 @@
 
     ;; 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.  
+    ;; 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
+    ;; basicphysics effectively does not model physics at all, making all objects phantom.
+    ;; Default is BulletSim
+    ;physics = BulletSim
     ;physics = modified_BulletX
     ;physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
+    ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+    physics = ubODE
 
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
 
+    ;; Default script engine to use. Currently, we only have XEngine
     DefaultScriptEngine = "XEngine"
 
+    ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
+    ; required
+    ; HttpProxy = "http://proxy.com:8080"
+
+    ; If you're using HttpProxy, then you can set HttpProxyExceptions to a
+    ; list of regular expressions for URLs that you don't want to go through
+    ; the proxy.
+    ; For example, servers inside your firewall.
+    ; Separate patterns with a ';'
+    ; HttpProxyExceptions = ".mydomain.com;localhost"
+
     ; ##
     ; ## EMAIL MODULE
     ; ##
-
+    ;; The email module requires some configuration. It needs an SMTP
+    ;; server to send mail through.
     ;emailmodule = DefaultEmailModule
 
     ; ##
@@ -327,6 +358,10 @@
     ; won't look right until the physics engine supports it
     ; (i.e delays takeoff for a moment)
 
+    ; #
+    ; # statistics
+    ; #
+
     ; Simulator statistics are output to the console periodically at debug level INFO.
     ; Setting this to zero disables this output.
     LogShowStatsSeconds = 0
@@ -365,16 +400,47 @@
     ; system with reduced logging
     LogOverloads = True
 
+    ; #
+    ; # Telehubs
+    ; #
+
+    ; SpawnPointRouting adjusts the landing for incoming avatars.
+    ; "closest" will place the avatar at the SpawnPoint located in the closest
+    ; available spot to the destination (typically map click/landmark).
+    ; "random" will place the avatar on a randomly selected spawnpoint;
+    ; "sequence" will place the avatar on the next sequential SpawnPoint
+    SpawnPointRouting = random
+
+    ; TelehubAllowLandmark allows users with landmarks to override telehub
+    ; routing and land at the landmark coordinates when set to true
+    ; default is false
+    TelehubAllowLandmark = true
+
+
+; Normally this section goes in the ThisSim.ini file, but this is common for all.
+[Region]
+    InternalAddress = "0.0.0.0"
+    ExternalHostName = "${Const|HostName}"
+
+
 [Map]
+    ; Map tile options.
+    ; If true, then maptiles are generated using the MapImageModule below.
+    ; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overridden
+    ; in individual region config file(s).  If you do not want to upload map tiles at all, then you will need
+    ; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
+    GenerateMaptiles = true
+
     ;WorldMapModule = "WorldMap"
+
+    ; The module to use in order to generate map images.
+    ; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can
+    ; generate better images.
     MapImageModule = "Warp3DImageModule"
 
     ; 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
 
@@ -392,17 +458,44 @@
     TexturePrims = true
 
     ; Only texture prims that have a diagonal size greater than this number
-    TexturePrimSize = 24
+    TexturePrimSize = 1
 
     ; Attempt to render meshes and sculpties on the map
     RenderMeshes = true;
 
+    ; where to store cached map tiles.
+    CacheDirectory = "${Paths|CachePath}/MapImageCache"
+
+    ; Draw map position at bottom right.
+    enablePosition = true
+
+    ; Refresh the cached map tile once a month.
+    ;RefreshEveryMonth = true
+
+    ;# {MapColorWater} {} {Water color for textured and shaded maps} {"#1D475F"}
+    ; MapColorWater = "#3399FF"
+
+    ;# {MapColor1} {} {Terrain color 1 for textured maps} {"#A58976"}
+    ; MapColor1 = "#A58976"
+
+    ;# {MapColor2} {} {Terrain color 2 for textured maps} {"#455931"}
+    ; MapColor2 = "#455931"
+
+    ;# {MapColor3} {} {Terrain color 3 for textured maps} {"#A29A8D"}
+    ; MapColor3 = "#A29A8D"
+
+    ;# {MapColor4} {} {Terrain color 4 for textured maps} {"#C8C8C8"}
+    ; MapColor4 = "#C8C8C8"
+
+
 [Permissions]
     ; ##
     ; ## PERMISSIONS
     ; ##
 
-    ;permissionmodules = "DefaultPermissionsModule"
+    ; Permission modules to use, separated by comma.
+    ; Possible modules are DefaultPermissionsModule, PrimLimitsModule
+    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.
@@ -410,13 +503,29 @@
     ; Default is true
     serverside_object_permissions = true
 
-    allow_grid_gods = true
 
-    ; This allows somne control over permissions
+    ; This allows some 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 = true
-    parcel_owner_is_god = false
+
+    ; This allows grid users with a UserLevel of 200 or more to assume god
+    ; powers in the regions in this simulator.
+    allow_grid_gods = true
+
+    ; Allow region owners to assume god powers in their regions
+    ;region_owner_is_god = true
+
+    ; Allow region managers to assume god powers in regions they manage
+    ;region_manager_is_god = false
+
+    ; God mode should be turned on in the viewer whenever
+    ; the user has god rights somewhere. They may choose
+    ; to turn it off again, though.
+    automatic_gods = false
+
+    ; The user can execute any and all god functions, as
+    ; permitted by the viewer UI, without actually "godding
+    ; up". This is the default state in 0.8.2.
+    implicit_gods = true
 
     ; Control user types that are allowed to create new scripts
     ; Only enforced if serviceside_object_permissions is true
@@ -437,7 +546,7 @@
     ; 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. 
+    ; 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
@@ -473,24 +582,99 @@
     AllowRegionRestartFromClient = true
 
 
+[Estates]
+    ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
+    ; If these values are uncommented then they will be used to create a default estate as necessary.
+    ; New regions will be automatically assigned to that default estate.
+
+    ;# {DefaultEstateName} {} {Default name for estate?} {} My Estate
+    ;; Name for the default estate
+    ; DefaultEstateName = My Estate
+
+    ;# {DefaultEstateOwnerName} {} {Default estate owner name?} {} FirstName LastName
+    ;; Name for default estate owner
+    ; DefaultEstateOwnerName = FirstName LastName
+
+
+    ; ** Standalone Estate Settings **
+    ; The following parameters will only be used on a standalone system to
+    ; create an estate owner that does not already exist
+
+    ;# {DefaultEstateOwnerUUID} {} {Default estate owner UUID?} {} 00000000-0000-0000-0000-000000000000
+    ;; If DefaultEstateOwnerUUID is left at UUID.Zero (as below) then a random
+    ;; UUID will be assigned. This is normally what you want
+    ; DefaultEstateOwnerUUID = 00000000-0000-0000-0000-000000000000
+
+    ;# {DefaultEstateOwnerEMail} {} {Default estate owner email?} {}
+    ;; Email address for the default estate owner
+    ; DefaultEstateOwnerEMail = owner@domain.com
+
+    ;# {DefaultEstateOwnerPassword} {} {Default estate owner password} {}
+    ;; Password for the default estate owner
+    ; DefaultEstateOwnerPassword = password
+
+
+[UserProfiles]
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; If the ProfileServiceURL is not set, then very BASIC
+  ;; profile support will be configured. If the ProfileServiceURL is set to a
+  ;; valid URL, then full profile support will be configured. The URL
+  ;; points to your grid's Robust user profiles service
+  ;;
+  ProfileServiceURL = ${Const|GridURL}:${Const|PublicPort}
+
+  ;; set this to false to prevent your users to be sent to unknown
+  ;; web sites by other users on their profiles
+  ; AllowUserProfileWebURLs = true
+
+
 [SMTP]
+    ;; The SMTP server enabled the email module to send email to external
+    ;; destinations.
+
+    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
+    ;; Enable sending email via SMTP
     enabled = false
 
-    ;enabled = true
-    ;internal_object_host = lsl.opensim.local
-    ;host_domain_header_from = 127.0.0.1
-    ;SMTP_SERVER_HOSTNAME = 127.0.0.1
-    ;SMTP_SERVER_PORT = 25
-    ;SMTP_SERVER_LOGIN = foo
-    ;SMTP_SERVER_PASSWORD = bar
+    ;# {internal_object_host} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Host name to treat as internal (object to object) email?} {} lsl.opensim.local
+    ; internal_object_host = lsl.opensim.local
+
+    ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
+    ; host_domain_header_from = "127.0.0.1"
+
+    ;# {email_pause_time} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Period in seconds to delay after an email is sent.} {} 20
+    ; email_pause_time = 20
+
+    ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
+    ; email_max_size = 4096
+
+    ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
+    ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
+
+    ;# {SMTP_SERVER_PORT} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {SMTP server port?} {} 25
+    ; SMTP_SERVER_PORT = 25
+
+    ;# {SMTP_SERVER_LOGIN} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server user name?} {}
+    ; SMTP_SERVER_LOGIN = ""
+
+    ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
+    ; SMTP_SERVER_PASSWORD = ""
 
 
 [Network]
+    ;; Configure the remote console user here. This will not actually be used
+    ;; unless you use -console=rest at startup.
     ;ConsoleUser = "Test"
     ;ConsolePass = "secret"
-    ;http_listener_port = 9000
     ;console_port = 0
 
+    ;# {http_listener_port} {} {TCP Port for this simulator to listen on? (This must be unique to the simulator!)} {} 9000
+    ;; Simulator HTTP port. This is not the region port, but the port the
+    ;; entire simulator listens on. This port uses the TCP protocol, while
+    ;; the region ports use UDP.
+    ;http_listener_port = 9000
+
     ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
     ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
     ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
@@ -499,7 +683,7 @@
     http_listener_sslport = 9001 ; Use this port for SSL connections
     http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
 
-    ; HTTPS for "Out of band" management applications such as the remote 
+    ; HTTPS for "Out of band" management applications such as the remote
     ; admin module
     ;
     ; Create https_listener = "True" will create a listener on the port
@@ -513,9 +697,46 @@
     ; Password for cert
     ; cert_pass = "password"
 
+    ; By default, OpenSimulator does not allow scripts to make HTTP calls to addresses on the simulator's LAN.
+    ; See the OutboundDisallowForUserScripts parameter in OpenSimDefaults.ini for more information on this filter.
+    ; If you need to allow scripts to make some LAN calls use the OutboundDisallowForUserScriptsExcept parameter below.
+    ; We recommend that you do not override OutboundDisallowForUserScripts directly unless you are very sure about what you're doing.
+    ;
+    ; You can whitelist individual endpoints by IP or FQDN, e.g.
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003
+    ;
+    ; You can specify multiple addresses by separating them with a bar.  For example,
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.3:8003|myinternalserver:8000
+    ;
+    ; If an address if given without a port number then port 80 is assumed
+    ;
+    ; You can also specify a network range in CIDR notation to whitelist, e.g.
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.0/24
+    ;
+    ; to whitelist all ports on addresses 192.168.1.0 to 192.168.1.255
+    ; To specify an individual IP address use the /32 netmask
+    ;
+    ; OutboundDisallowForUserScriptsExcept = 192.168.1.2/32
+    ;
+    ; See http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation for more information on CIDR notation
+
+    ; Maximum bytes allowed for HTTP_BODY_MAXLENGTH.
+    ; By default, llHTTPRequest limits the response body to 2048 bytes.
+    ; This limit can be extended using HTTP_BODY_MAXLENGTH to a maximum
+    ; of HttpBodyMaxLenMAX bytes.
+    ; Please be aware that the limit can be set to insanely high values,
+    ; effectively removing any limitation. This will expose your sim to a
+    ; known attack. It is not recommended to set this limit higher than
+    ; the highest value that is actually needed by existing applications!
+    ; 16384 is the SL compatible value.
+    ; HttpBodyMaxLenMAX=16384
+
     ; Hostname to use in llRequestURL/llRequestSecureURL
-    ; if not defined - default machine name is being used
-    ; (on Windows this mean NETBIOS name - useably only inside local network)
+    ; if not defined - llRequestURL/llRequestSecureURL are disabled
+    ; ExternalHostNameForLSL=127.0.0.1
     ExternalHostNameForLSL = "${Const|HostName}"
 
     ; Disallow the following address ranges for user scripting calls (e.g. llHttpRequest())
@@ -549,29 +770,65 @@
     ; " (Mozilla Compatible)" to the text where there are problems with a web server
     ;user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+    ;; The following 3 variables are for HTTP Basic Authentication for the Robust services.
+    ;; Use this if your central services in port 8003 need to be accessible on the Internet
+    ;; but you want to protect them from unauthorized access. The username and password
+    ;; here need to match the ones in the Robust service configuration.
+    ; AuthType = "BasicHttpAuthentication"
+    ; HttpAuthUsername = "some_username"
+    ; HttpAuthPassword = "some_password"
+    ;;
+    ;; Any of these 3 variables above can be overriden in any of the service sections.
+
     ; OpenSim can send multiple simultaneous requests for services such as asset
     ; retrieval. However, some versions of mono appear to hang when there are too
     ; 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.
+    ;; One can use a substring of the viewer name to enable only certain
+    ;; versions
+    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
+    ;; - "Imprudence" has access
+    ;; - "Imprudence 1.3" has access
+    ;; - "Imprudence 1.3.1" has no access
     ; AllowedClients = ""
 
-    ; Viewer-based access control. |-separated list of denied viewers. 
+    ; Viewer-based access control. |-separated list of denied viewers.
+    ;; One can use a Substring of the viewer name to disable only certain
+    ;; versions
+    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
+    ;; - "Imprudence" has no access
+    ;; - "Imprudence 1.3" has no access
+    ;; - "Imprudence 1.3.1" has access
     ; 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
-    ; affect whether networking internals such as packet decoding and
-    ; acknowledgement accounting are done synchronously or asynchronously
-    ; Default is true.
-    ;
-    ;async_packet_handling = true
+[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
 
+    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
+    ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
+    ;; will use this address to register xmlrpc channels on the external
+    ;; service
+    ; XmlRpcHubURI = http://example.com
+
+
+[ClientStack.LindenUDP]
     ; The client socket receive buffer size determines how many
     ; incoming requests we can process; the default on .NET is 8192
     ; which is about 2 4k-sized UDP datagrams. On mono this is
@@ -604,7 +861,7 @@
     ;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 
+    ; 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.
     ;
@@ -681,11 +938,17 @@
 
 
 [ClientStack.LindenCaps]
-    ;; Long list of capabilities taken from 
+    ;; Long list of capabilities taken from
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
     ;; Not all are supported by OpenSim. The ones supported are
     ;; set to localhost. These defaults can be overwritten
     ;; in OpenSim.ini
+    ;; Possible values are:
+    ;;   "" -- empty, capability disabled
+    ;;   "localhost" -- capability enabled and served by the simulator
+    ;;   "<url>" -- capability enabled and served by some other server
+    ;;
+    ; These are enabled by default to localhost. Change if you see fit.
     ;;
     Cap_AttachmentResources = ""
     Cap_ChatSessionRequest = ""
@@ -705,7 +968,8 @@
     Cap_GetObjectCost = ""
     Cap_GetObjectPhysicsData = ""
     Cap_GroupProposalBallot = ""
-    Cap_HomeLocation = ""
+    Cap_GroupMemberData = "localhost"
+    Cap_HomeLocation = "localhost"
     Cap_LandResources = ""
     Cap_MapLayer = "localhost"
     Cap_MapLayerGod = "localhost"
@@ -756,31 +1020,42 @@
     Cap_AvatarPickerSearch = "localhost"
 
 
+[SimulatorFeatures]
+    ;# {SearchServerURI} {} {URL of the search server} {}
+    ;; Optional. If given this serves the same purpose as the grid wide
+    ;; [LoginServices] SearchURL setting and will override that where
+    ;; supported by viewers.
+    ;SearchServerURI = "http://127.0.0.1:9000/"
+
+    ;# {DestinationGuideURI} {} {URL of the destination guide} {}
+    ;; Optional. If given this serves the same purpose as the grid wide
+    ;; [LoginServices] DestinationGuide setting and will override that where
+    ;; supported by viewers.
+    ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
+
+
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
-    enabled = true;
+    enabled = true
 
     ; Distance in meters that whispers should travel.  Default is 10m
-    whisper_distance = 10
+    whisper_distance = 15
 
     ; Distance in meters that ordinary chat should travel.  Default is 20m
-    say_distance = 20
+    say_distance = 40
 
     ; Distance in meters that shouts should travel.  Default is 100m
-    shout_distance = 100
+    shout_distance = 256
 
 
 [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 = 0
-
     ; Allow avatars to cross into and out of the region.
     AllowAvatarCrossing = true
 
+    ; This disables border transfers for objects. When true, objects can be placed outside
+    ; the region's border without being transferred to another simulator.
+    DisableObjectTransfer = false
+
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
 
@@ -789,14 +1064,18 @@
     ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
     DisableInterRegionTeleportCancellation = false
 
+    ;; This option exists to control the behavior of teleporting gods into places that have landing points
+    ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for
+    ;; avatars with god permissions; SL lets gods land wherever they want.
+    LandingPointBehavior = LandingPointBehavior_SL
+
 
 [Messaging]
     ; Control which region module is used for instant messaging.
     ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
-    InstantMessageModule = InstantMessageModule
+
+    ; InstantMessageModule = InstantMessageModule
     ; MessageTransferModule = MessageTransferModule
-    ; OfflineMessageURL = http://yourserver/Offline.php
-    ; MuteListURL = http://yourserver/Mute.php
 
     ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
     ;; Module to handle offline messaging. The core module requires an external
@@ -807,22 +1086,24 @@
 
     ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
     ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
-    ; OfflineMessageURL = ${Const|GridURL}/Offline.php
-    OfflineMessageURL = ${Const|GridURL}:${Const|PrivatePort}
+    ;OfflineMessageURL = ${Const|BaseURL}/Offline.php
+    OfflineMessageURL = ${Const|BaseURL}:${Const|PrivatePort}
 
     ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
     ;; For standalones, this is the storage dll.
-    StorageProvider = OpenSim.Data.MySQL.dll
-
-    ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
-    ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
-    ;; messages to work
+    StorageProvider = "${Const|DataProvider}"
+
+    ; Mute list handler
+    ; the provided MuteListModule is just a Dummy
+    ; you will need a external module for proper suport.
+    ; if you keep both 2 following settings comment, viewers will use mutes in their caches
+    ; if you uncoment both (url is ignored) the mutes will be deleted at login on this instance regions
+    ; WARNING: viewers mutes cache seems to shared by all grids, including SL
+    ; this may cause some confusion.
+    ;# {MuteListModule} {MuteListModule:MuteListModule} {} {} None
     MuteListModule = MuteListModule
-
-    ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php
-    ;; URL of the web service that serves mute lists. Not currently used, but
-    ;; must be set to allow offline messaging to work.
-    MuteListURL = "${Const|GridURL}/opensim/mute.php"
+    ;# {MuteListURL} {MuteListModule:MuteListModule} {} {} http://yourserver/Mute.php
+    MuteListURL = ${Const|BaseURL}/Mute.php
 
     ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
@@ -839,7 +1120,7 @@
 
 [Appearance]
     ; Persist avatar baked textures
-    ; Persisting baked textures can speed up login and region border 
+    ; Persisting baked textures can speed up login and region border
     ; crossings especially with large numbers of users, though it
     ; will store potentially large numbers of textures in your asset
     ; database
@@ -850,13 +1131,14 @@
     ; by the very chatty dialog that sets appearance when an avatar
     ; logs in or teleports into a region; values are in seconds
     DelayBeforeAppearanceSave = 5
+    DelayBeforeAppearanceSend = 2
 
     ; 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 
+    ; 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
 
-    ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar 
+    ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar
     ; on every login
     ReuseTextures = true
 
@@ -870,22 +1152,38 @@
     ; 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;
+    ThrottlePer100PrimsRezzed = 0
 
 
 [Mesh]
-    ; enable / disable Collada mesh support
+    ; enable / disable mesh asset uploads
+    ; mesh asset must conform to standard mesh format, with OpenSim extensions
     ; default is true
     AllowMeshUpload = true
 
-    ; if you use Meshmerizer and want collisions for meshies, setting this to true
-    ; will cause OpenSim to attempt to decode meshies assets, extract the physics
-    ; mesh, and use it for collisions. 
-    UseMeshiesPhysicsMesh = true
-
     ; Minimum user level required to upload meshes
     ;LevelUpload = 0
 
+    ; support meshes on physics
+    UseMeshiesPhysicsMesh = true
+
+    ;support convex shape type on normal prims
+    ; (ubOde only)
+    ;ConvexPrims = true
+
+    ;support convex shape type on sculpts
+    ; (ubOde only)
+    ;ConvexSculpts = true
+
+    ; mesh cache settings:
+    ; (ubOde only)
+    ; do cache (keep true)
+    ;MeshFileCache = true
+    ; cache folder name relative to bin/ or absolute path
+    ;MeshFileCachePath = MeshCache
+    ;MeshFileCacheDoExpire = true
+    ;MeshFileCacheExpireHours = 48
+
 
 [Textures]
     ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
@@ -905,93 +1203,9 @@
     ReuseDynamicLowDataTextures = false
 
 
-[BulletSim]
-    ; All the BulletSim parameters can be displayed with the console command
-    ;   "physics get all" and all are defined in the source file
-    ;    OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
-
-    ; 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 = true
-
-    ; Terrain implementation can use either Bullet's heightField or BulletSim can build
-    ;   a mesh. 0=heightField, 1=mesh
-    TerrainImplementation = 1
-    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
-    ;   resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
-    ;   magnifications use lots of memory.
-    TerrainMeshMagnification = 3
-
-    ; 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.
-; Has trouble with the lighthouse stairs, but all others work fine, can even climb over some fences.  Which is odd.
-    AvatarStepHeight = 0.6             ; The height, below which is considered a step collision.
-    AvatarStepAngle = 0.3              ; The angle from vertical (in radians) to consider a surface a step
-    AvatarStepApproachFactor = 2       ; Approach angle factor. O=straight on, .6=~45 degrees.
-    AvatarStepGroundFudge = 0.1        ; Fudge added to bottom of avatar below which step collisions happen
-    AvatarStepForceFactor = 0          ; Avatar is pushed up by its mass times this factor
-    AvatarStepUpCorrectionFactor = 1.1 ; Avatar is displaced up the collision height times this factor
-    AvatarStepSmoothingSteps = 3       ; 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
-
-    ; 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
-
-    ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
-    ;   Happens often in sculpties. If turned off, there will be some doorways
-    ;   that cannot be walked through.
-    ShouldRemoveZeroWidthTriangles = true
-
-    ; If 'true', use convex hull definition in mesh asset if present.
-    ShouldUseAssetHulls = true
-
-    ; If there are thousands of physical objects, these maximums should be increased.
-    MaxCollisionsPerFrame = 2048
-    MaxUpdatesPerFrame = 8192
-
-    ; Detailed physics debug logging. Very verbose.
-    PhysicsLoggingEnabled = False
-    PhysicsLoggingDir = "."
-    VehicleLoggingEnabled = False
-
-
 [ODEPhysicsSettings]
-    ; ## 
-    ; ## Physics stats settings
+    ; ##
+    ; ## Physics stats settings ( most ignored by ubOde )
     ;
 
     ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule
@@ -1023,19 +1237,24 @@
     ; Max value is 255, min value is 0
     avatar_terminal_velocity = 54
 
-    ; World Step size. (warning these are dangerous.  Changing these will probably cause your scene to explode dramatically)
-    ; reference: fps = (0.089/ODE_STEPSIZE) * 1000;
-    world_stepsize = 0.0178
-    world_internal_steps_without_collisions = 10
-
-    ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
-    world_hashspace_size_low = -4
-    world_hashSpace_size_high = 128
+    ; World Step size.
+    ; with legacy ODE this value needs to be close to 0.02s
+    ; with ubOde this value can be reduced to improve simulation quality with the cost of higher cpu load
+    ; you will need to test acording to you needs
+    ; choosing a value that is a integer sub multiple of FrameRate reduces some jitter on reported physics FPS
+    world_stepsize = 0.01818
+    ; number of iterations of constrains solver, higher should improve results
+    ; up to a point where acumulated math errors eliminate the improvement
+    ; more steps may increase CPU load. No real gain in changing
+    world_solver_iterations = 10
+
+    ;Spaces level settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
+    ; defines spaces partition cells min and max sizes == 2^value
+    world_hashspace_level_low = -5
+    world_hashSpace_level_high = 12
 
-    ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
     meters_in_small_space = 29.9
-    small_hashspace_size_low = -4
-    small_hashspace_size_high = 66
+
 
     ; ##
     ; ## Contact properties. (the stuff that happens when things come in contact with each other)
@@ -1074,18 +1293,14 @@
     ; desired velocity
     ; See http://en.wikipedia.org/wiki/PID_controller
 
-    av_pid_derivative_linux = 2200.0
-    av_pid_proportional_linux = 900.0;
-
-    av_pid_derivative_win = 2200.0
-    av_pid_proportional_win = 900.0;
+    av_pid_derivative = 2200.0
+    av_pid_proportional = 900.0
 
     ;girth of the avatar.  Adds radius to the height also
     av_capsule_radius = 0.37
 
     ; Max force permissible to use to keep the avatar standing up straight
-    av_capsule_standup_tensor_win = 550000
-    av_capsule_standup_tensor_linux = 550000
+    av_capsule_standup_tensor = 550000
 
     ; specifies if the capsule should be tilted (=true; old compatibility mode)
     ; or straight up-and-down (=false; better and more consistent physics behavior)
@@ -1112,8 +1327,8 @@
     minimum_ground_flight_offset = 3.0
 
     ; Plant avatar.   This reduces the effect of physical contacts with the avatar.
-    ; If you have a group of unruly and rude visitors that bump each other, turn this on to make that less attractive.  
-    ; The avatar still allows a small movement based on the PID settings above.  Stronger PID settings AND this active 
+    ; If you have a group of unruly and rude visitors that bump each other, turn this on to make that less attractive.
+    ; The avatar still allows a small movement based on the PID settings above.  Stronger PID settings AND this active
     ; will lock the avatar in place
     av_planted = false
 
@@ -1137,19 +1352,12 @@
     ; maximum number of contact points to generate per collision
     contacts_per_collision = 80
 
-    ; amount of time a geom/body will try to cross a region border before it gets disabled
-    geom_crossing_failures_before_outofbounds = 5
-
     ; start throttling the object updates if object comes in contact with 3 or more other objects
     geom_contactpoints_start_throttling = 3
 
     ; send 1 update for every x updates below when throttled
     geom_updates_before_throttled_update = 15
 
-    ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
-    body_motor_joint_maxforce_tensor_linux = 5
-    body_motor_joint_maxforce_tensor_win = 5
-
     ; Maximum mass an object can be before it is clamped
     maximum_mass_object = 10000.01
 
@@ -1158,6 +1366,9 @@
     ; ##
 
     ; Do we want to mesh sculpted prim to collide like they look?
+    ; If you are seeing sculpt texture decode problems
+    ; (messages such as "Decoded image with unhandled number of components: 0 shortly followed by a physcs exception")
+    ; then you might want to try setting this to false.
     mesh_sculpted_prim = true
 
     ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
@@ -1167,28 +1378,107 @@
     mesh_physical_lod = 16
 
     ; ##
-    ; ## Joint support
+    ; ## additional meshing options
     ; ##
 
-    ; 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
+    ; Physics needs to create internal meshs (or convert the object meshs or scultps)
+    ; for all prims except simple boxes and spheres.
 
-    ; ##
-    ; ## additional meshing options
-    ; ##
+    ; collisions of small objects againts larger ones can have a increased CPU load cost
+    ; so this are represented by a simple BOX
+    ; if all their scale dimensions are lower or equal to this option. Default is 0.1m
+    ; (ubOde only)
+    ; MinSizeToMeshmerize = 0.1
 
-    ; 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 = false
+
+[BulletSim]
+    ; All the BulletSim parameters can be displayed with the console command
+    ;   "physics get all" and all are defined in the source file
+    ;    OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
+
+    ; 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 = true
+
+    ; Terrain implementation can use either Bullet's heightField or BulletSim can build
+    ;   a mesh. 0=heightField, 1=mesh
+    TerrainImplementation = 1
+    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
+    ;   resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
+    ;   magnifications use lots of memory.
+    TerrainMeshMagnification = 3
+
+    ; 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.
+;;;; Has trouble with the lighthouse stairs, but all others work fine, can even climb over some fences.  Which is odd.
+    AvatarStepHeight = 0.6             ; The height, below which is considered a step collision.
+    AvatarStepAngle = 0.3              ; The angle from vertical (in radians) to consider a surface a step
+    AvatarStepApproachFactor = 2       ; Approach angle factor. O=straight on, .6=~45 degrees.
+    AvatarStepGroundFudge = 0.1        ; Fudge added to bottom of avatar below which step collisions happen
+    AvatarStepForceFactor = 0          ; Avatar is pushed up by its mass times this factor
+    AvatarStepUpCorrectionFactor = 1.1 ; Avatar is displaced up the collision height times this factor
+    AvatarStepSmoothingSteps = 3       ; 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
+
+    ; 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
+
+    ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
+    ;   Happens often in sculpties. If turned off, there will be some doorways
+    ;   that cannot be walked through.
+    ShouldRemoveZeroWidthTriangles = true
+
+    ; If 'true', use convex hull definition in mesh asset if present.
+    ShouldUseAssetHulls = true
+
+    ; If there are thousands of physical objects, these maximums should be increased.
+    MaxCollisionsPerFrame = 2048
+    MaxUpdatesPerFrame = 8192
+
+    ; Detailed physics debug logging. Very verbose.
+    PhysicsLoggingEnabled = False
+    PhysicsLoggingDir = "."
+    VehicleLoggingEnabled = False
 
 
 [RemoteAdmin]
+    ;; This is the remote admin module, which uses XMLRPC requests to
+    ;; manage regions from a web interface.
+
     enabled = false
 
     ; Set this to a nonzero value to have remote admin use a different port
@@ -1248,7 +1538,7 @@
     copy_folders = true
 
     ; path to default appearance XML file that specifies the look of the default avatars
-    ;default_appearance = default_appearance.xml 
+    ;default_appearance = default_appearance.xml
 
 
 ; RestPlugins are not currently operational.
@@ -1278,9 +1568,9 @@
 ;    flush-on-error = true
 
 
-; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
-; also, not good error detection when it fails
 [IRC]
+    ; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
+    ; also, not good error detection when it fails
     enabled = false; you need to set this to true otherwise it won't connect
     ;server  = name.of.irc.server.on.the.net
     ;; user password - only use this if the server requires one
@@ -1349,9 +1639,9 @@
     ;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
 [Sun]
+    ; The following settings control the progression of daytime
+    ; in the Sim.  The defaults are the same as the commented out settings
     ; number of wall clock hours for an opensim day.  24.0 would mean realtime
     day_length = 24
     ; Year length in days
@@ -1399,13 +1689,28 @@
     cloud_update_rate = 1000
 
 
+[LightShare]
+    ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
+    ; It has no ill effect on viewers which do not support server-side windlight settings.
+    enable_windlight = true
+
+
 [Trees]
-    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
-    ; default is false
+    ; enable the trees module. default true
+    enabled = true
+
+    ; active_trees allows module to change its trees in time.
+    ; some will be deleted, others created and rest may grow
+    ; default is false. You can change it with console command tree active true | false later
     active_trees = false
+    ; the trees change execution time rate (in ms)
+    update_rate = 1000
 
-    ; Density of tree population
-    tree_density = 1000.0
+    ; allow the trees to grow.
+    ; DANGER
+    ; this option causes high network use on the order of
+    ; NumberOfTrees * NumberAvatars * 1000 / update_rate udp packets per second
+    allowGrow = false
 
 
 [VectorRender]
@@ -1582,9 +1887,6 @@
     ; 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
 
@@ -1629,7 +1931,7 @@
     default_snapshot_period = 1200
 
     ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
+    snapshot_cache_directory = "${Paths|CachePath}/DataSnapshot"
 
     ; Uncomment if you want to index your data with this and/or other search providers. One entry per
     ; data service
@@ -1637,6 +1939,15 @@
 
 
 [Economy]
+    ; the economy module in use
+    ; default is the provided BetaGridLikeMoneyModule
+    ; - This module is for demonstration only -
+    ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
+    ; There is no intention to implement anything further in core OpenSimulator.
+    ; This functionality has to be provided by third party modules.
+    ; To use other modules you need to override this setting on OpenSim.ini Economy (or startup) section
+    ; economymodule = BetaGridLikeMoneyModule
+
     ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
     ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
     ; There is no intention to implement anything further in core OpenSimulator.
@@ -1646,28 +1957,28 @@
     SellEnabled = true
 
     ;; Money Unit fee to upload textures, animations etc.  Default is 0.
-    PriceUpload = 0 
+    PriceUpload = 0
 
     ;; Money Unit fee to create groups.  Default is 0.
-    PriceGroupCreate = 0 
+    PriceGroupCreate = 0
 
     ; We don't really know what the rest of these values do.  These get sent to the client
     ; These taken from Agni at a Public Telehub.  Change at your own risk.
-    ObjectCount = 0
-    PriceEnergyUnit = 100
-    PriceObjectClaim = 10
-    PricePublicObjectDecay = 4
-    PricePublicObjectDelete = 4
-    PriceParcelClaim = 1
-    PriceParcelClaimFactor = 1
-
-    PriceRentLight = 5
-    TeleportMinPrice = 2
-    TeleportPriceExponent = 2
-    EnergyEfficiency = 1
-    PriceObjectRent = 1
-    PriceObjectScaleFactor = 10
-    PriceParcelRent = 1
+    ;ObjectCount = 0
+    ;PriceEnergyUnit = 0
+    ;PriceObjectClaim = 0
+    ;PricePublicObjectDecay = 0
+    ;PricePublicObjectDelete = 0
+    ;PriceParcelClaim = 0
+    ;PriceParcelClaimFactor = 1
+
+    ;PriceRentLight = 0
+    ;TeleportMinPrice = 0
+    ;TeleportPriceExponent = 2
+    ;EnergyEfficiency = 1
+    ;PriceObjectRent = 0
+    ;PriceObjectScaleFactor = 10
+    ;PriceParcelRent = 0
 
 
 [XEngine]
@@ -1692,20 +2003,35 @@
     ; Stack size per thread created
     ThreadStackSize = 262144
 
-    ; Set this to true (the default) to load each script into a separate
+    ; Set this to true to load each script into a separate
     ; AppDomain. Setting this to false will load all script assemblies into the
-    ; current AppDomain, which will reduce the per-script overhead at the
-    ; expense of reduced security and the inability to garbage collect the
-    ; 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.
+    ; current AppDomain, which will reduce the initial per-script memory overhead,
+    ; but deleted scripts stay inactive using memory.
+    ; Significantly improving script loading times.
+    ; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted.
+    ; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region.
+    ; This may only be a problem if regions stay alive for a long time with lots of scripts added or edited.
+    ; At this time some mono versions seem to have problems with the true option,
+    ; so default is now false until a fix is found, to simply life of less technical skilled users.
+    ; WARNING this makes OpenSim use four times as much memory!
+    AppDomainLoading = false
+
+    ; 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.
+    ; It should be true on first run after updating opensim binary version
+    ; after first run you can change to false.
+    ; You can also set it to false and delete the script DLLs by hand
+    ; This does not delete cached scripts state.
     DeleteScriptsOnStartup = false
 
-    ; Controls whether scripts are stopped by aborting their threads externally (abort) 
+    ; CompactMemOnLoad
+    ; forces calls to memory garbage collector before loading each script DLL during region startup.
+    ; Peak memory usage is reduced and region starts with a more compacted memory allocation.
+    ; But this costs a lot of time, so region load will take a lot longer.
+    ; it is more usefull if there are no previously compiled scripts DLLs (or DeleteScriptsOnStartup = true)
+    ; CompactMemOnLoad = 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.
@@ -1721,25 +2047,53 @@
     ; Save the source of all compiled scripts
     WriteScriptSourceToDebugFile = false
 
-    ; Default language for scripts
-    DefaultCompileLanguage = lsl
-
-    ; 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
-
     ; Compile debug info (line numbers) into the script assemblies
     CompileWithDebugInformation = true
 
+    ; Don't include stack traces in silly threat level errors, and don't bother with "OSSL Runtime Error: " either.
+    ; On the other hand, having this true stops the official OpenSim OhSilly detection script from working.
+    DebuggerSafe = true
+
     ; Allow the user of mod* functions.  This allows a script to pass messages
     ; to a region module via the modSendCommand() function
     ; Default is false
     AllowMODFunctions = true
 
+    ; Allow the use of os* functions (some are dangerous)
+    AllowOSFunctions = true
+
     ; Allow the user of LightShare functions
     AllowLightShareFunctions = true
 
+    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    OSFunctionThreatLevel = Moderate
+
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are
+    ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel
+    ; - PARCEL_OWNER: allow if the objectowner is parcelowner
+    ; - ESTATE_MANAGER: allow if the object owner is a estate manager
+    ; - ESTATE_OWNER: allow if objectowner is estateowner
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ...
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
     ; Interval (s) between background save of script states
     SaveInterval = 120
 
@@ -1754,7 +2108,7 @@
 
     ; 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;
+    WaitForEventCompletionOnScriptStop = 1000
 
     ; Maximum length of notecard line read
     ; Increasing this to large values potentially opens
@@ -1778,8 +2132,10 @@
     ; prims
     DisableUndergroundMovement = false
 
-    ;; Path to script assemblies 
-    ; ScriptEnginesPath = "ScriptEngines"
+    ;; Path to script assemblies
+    ScriptEnginesPath = "${Paths|CachePath}/ScriptEngines"
+
+    ; ==== Settings for MOD and OSSL functions have been moved to the [OSSL] section
 
 
 [OSSL]
@@ -1802,7 +2158,8 @@
 
     ; regex specifying for which regions concierge service is desired; if
     ; empty, then for all
-    regions = "^MeetingSpace-"
+    ;regions = "^MeetingSpace-"
+    regions = ""
 
     ; for each region that matches the regions regexp you can provide
     ; (optionally) a welcome template using format substitution:
@@ -1810,14 +2167,14 @@
     ; {1} is replaced with the name of the region
     ; {2} is replaced with the name of the concierge (whoami variable above)
 
-    welcomes = /path/to/welcome/template/directory
+    ;welcomes = /path/to/welcome/template/directory
 
     ; Concierge can send attendee lists to an event broker whenever an
     ; avatar enters or leaves a concierged region. the URL is subject
     ; to format substitution:
     ; {0} is replaced with the region's name
     ; {1} is replaced with the region's UUID
-    broker = "http://broker.place.com/{1}"
+    ;broker = "http://broker.place.com/{1}"
 
 
 [MRM]
@@ -1926,17 +2283,21 @@
 
 [Groups]
     Enabled = true
-
     ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
     ;; The default module can use a PHP XmlRpc server from the Flotsam project at
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
+    ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
+    ; apply to the Flotsam/SimianGrid GroupsModule
     ; Module = Default
+    ; This module can use a PHP XmlRpc server from the Flotsam project at http://code.google.com/p/flotsam/
+    ; or from the SimianGrid project at http://code.google.com/p/openmetaverse
+    ;Module  = GroupsModule
     ;; or... use Groups Module V2, which works for standalones and robust grids
-    Module = "Groups Module V2"
+     Module = "Groups Module V2"
 
-    ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
-    StorageProvider = OpenSim.Data.MySQL.dll
+    ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll}
+    StorageProvider = "${Const|DataProvider}"
 
     ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one as follows:
@@ -1953,24 +2314,39 @@
     LocalService = remote
 
     ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} ""
-    ;; Used for V2 in Remote only. 
-    ; SecretKey = ""
+    ;; Used for V2 in Remote only.
+    ; SecretKey = "sEcReTkEy"
 
     ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
     ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-    ;; or ${Const|GridURL}:${Const|PrivatePort} for robust, V2
+    ;; or ${Const|BaseURL}:${Const|PrivatePort} for robust, V2
     ;; Leave it commented for standalones, V2
-    GroupsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+    GroupsServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
-    ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
+    ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {}
     ;; Used for V2 in HG only. For example
     ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
     ;; If you have this set under [Startup], no need to set it here, leave it commented
-    ; HomeURI = ""
+    HomeURI = ${Const|BaseURL}:${Const|PublicPort}
+
+    ; Enable Group Notices
+    NoticesEnabled   = true
+
+    ; 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
 
-    ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
+    ; 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
+    GroupsCacheTimeout = 30
+
+    ; Specify which messaging module to use for groups messaging and if it's enabled
+    ;MessagingModule = GroupsMessagingModule
     MessagingEnabled = true
 
     ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
@@ -1978,45 +2354,36 @@
     ; or use "Groups Messaging Module V2" for Groups V2
     MessagingModule = "Groups Messaging Module V2"
 
-    ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
-    ;; Enable Group Notices
-    NoticesEnabled = true
-
-    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module} {Message online users only?} {true false} false
-    ; Experimental option to only message online users rather than all users
-    ; Should make large groups with few online members messaging faster, as the expense of more calls to presence service
-    ; Applies Flotsam Group only. V2 has this always on, no other option
+    ; Experimental option to only message cached online users rather than all users
+    ; Should make large group with few online members messaging faster, at the expense of more calls to ROBUST presence service
+    ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = true
 
-    ;; This makes the Group module very chatty on the console.
-    ; DebugEnabled = false
+    ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
 
-    ; This makes the Group Messaging module very chatty on the console.
-    ; DebugMessagingEnabled = false
+    ; SimianGrid Service for Groups
+    ;ServicesConnectorModule = SimianGroupsServicesConnector
+    ;GroupsServerURI = http://mygridserver.com:82/Grid/
 
-    ;; XmlRpc Security settings.  These must match those set on your backend
-    ;; groups service if the service is using these keys
-    ; XmlRpcServiceReadKey    = 1234
-    ; XmlRpcServiceWriteKey   = 1234
+    ; Flotsam XmlRpc Service for Groups
+    ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
+    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
 
-    ; 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
-    GroupsCacheTimeout = 30
+    ; XmlRpc Security settings.  These must match those set on your backend groups service if the service is using these keys
+    ;XmlRpcServiceReadKey    = 1234
+    ;XmlRpcServiceWriteKey   = 1234
 
     ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
-    ; this is a work around for a problem discovered on some Windows based region servers.
-    ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
-    ; System.Net.WebException: The request was aborted: The request was canceled.
-    ; XmlRpcDisableKeepAlive = false
+    ; only set to false it if you absolute sure regions and groups server support it.
+    ; XmlRpcDisableKeepAlive = true
 
     ; Minimum user level required to create groups
     LevelGroupCreate = 0
 
 
 [PacketPool]
-    ;RecyclePackets = true;
-    ;RecycleDataBlocks = true;
+    ;RecyclePackets = true
+    ;RecycleDataBlocks = true
 
     ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
     ; This reduces data churn
@@ -2033,6 +2400,10 @@
     RootReprioritizationDistance = 10.0
     ChildReprioritizationDistance = 20.0
 
+    ; TEST OPTION KEEP AS FALSE
+    ; if true, don't send object updates if outside view range
+    ObjectsCullingByDistance = false
+
     ; 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.
@@ -2057,6 +2428,8 @@
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
     ; Also is another source of region statistics provided via the regionstats URL
     Enabled = true
+    ; next option may still use framework performance monitors designed for debug only, so avoid it
+    ;ServerStatsEnabled = false
 
 
 [WebStats]
@@ -2068,46 +2441,32 @@
 
 
 [Statistics]
-    ; NumberOfFrames is used in a moving average calculation, where NumberOfFrames is the number of frames 
+    ; 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;
+    Enabled = 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
-    ProfileServiceURL = ${Const|GridURL}:${Const|PublicPort}
+[NPC]
+    ;; Enable Non Player Character (NPC) facilities
+    Enabled = true
+    ;; several options to control NPCs creation
 
+    ;; allow NPCs to be created not Owned {true false} default: true
+    AllowNotOwned = true
 
-[XBakes]
-    ;# {URL} {} {Set URL for Baked texture service} {}
-    ;; Sets the URL for the baked texture ROBUST service.
-    ;; Disabled when unset.
-    URL = ${Const|GridURL}:${Const|PrivatePort}
+    ;; allow NPCs to set to be sensed as Avatars {true false} default: true
+    AllowSenseAsAvatar = true
 
+    ;; allow NPCs to created cloning any avatar in region {true false} default: true
+    AllowCloneOtherAvatars = true
 
-;;
-;; Optional module to highlight God names in the viewer.
-;; Uncomment and customize appropriately if you want this behavior.
-;; Alas IG uses first names for gods, not sure if that will work.
-;;
-;[GodNames]
-;       Enabled = false
-;       FullNames = "Test User, Foo Bar"
-;       Surnames = "Kryztlsk"
-
+    ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
+    NoNPCGroup = false
 
 [Terrain]
     ; Values can be "pinhead-island" or "flat"
@@ -2117,7 +2476,6 @@
     ;     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
@@ -2130,8 +2488,10 @@
     LimitParcelLayerUpdateDistance = false
     ParcelLayerViewDistance = 1024
 
+    ; set this to false to not display parcel ban lines
+    ShowParcelBansLines = true
+
 
-;;
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
 ;;
@@ -2142,8 +2502,8 @@
 
 
 ;;
-;; JsonStore module provides structured store for scripts 
-;; 
+;; JsonStore module provides structured store for scripts
+;;
 [JsonStore]
     Enabled = true
 
@@ -2196,3 +2556,24 @@
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
+
+
+[Materials]
+    ;; This enables the use of Materials.
+     enable_materials = true
+     MaxMaterialsPerTransaction = 50
+
+
+[XBakes]
+  ;; Sets the URL for the baked texture ROBUST service.
+  ;; Disabled when unset.
+   URL = ${Const|BaseURL}:${Const|PrivatePort}
+
+
+;; Optional module to highlight God names in the viewer.
+;; Uncomment and customize appropriately if you want this behavior.
+;;
+;[GodNames]
+;       Enabled = false
+;       FullNames = "Test User, Foo Bar"
+;       Surnames = "Kryztlsk"