1 files changed, 365 insertions, 197 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 658b993..d395efe 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -3,9 +3,12 @@
 ;; If it's named OpenSim.ini.example then you will need to copy it to 
 ;; OpenSim.ini first (if that file does not already exist)
 ;;
-;; If you are copying, then once you have copied OpenSim.ini.example to 
-;; OpenSim.ini you will need to pick an architecture in the [Architecture] 
-;; section at the end of this file.
+;; Once you have copied OpenSim.ini.example to OpenSim.ini you will at least
+;; need to set the constants in the [Const] section and pick an architecture
+;; in the [Architecture] section at the end of this file. The architecture
+;; will require a suitable .ini file in the config-include directory, either
+;; StandaloneCommon.ini or GridCommon.ini which you can copy and modify from the
+;; available .example files.
 ;;
 ;; The settings in this file are in the form "<key> = <value>".  For example, 
 ;; save_crashes = false in the [Startup] section below.
@@ -42,6 +45,23 @@
 ;;    out.
 
 
+[Const]
+    ; For a grid these will usually be the externally accessible IP/DNS
+    ; name and use default public port 8002 and default private port 8003
+    ; For a standalone this will usually be the externally accessible IP/DNS
+    ; name and use default public port 9000. The private port is not used
+    ; in the configuration for a standalone.
+
+    ;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} "http://127.0.0.1"
+    BaseURL = http://127.0.0.1
+    
+    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
+    PublicPort = "8002"
+
+    ;# {PrivatePort} {} {PrivatePort} {8003} "8003"
+    PrivatePort = "8003"
+
+
 [Startup]
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
     ;; Console prompt
@@ -51,6 +71,19 @@
     ;; \\ - substitute \
     ; ConsolePrompt = "Region (\R) "
 
+    ;# {ConsoleHistoryFileEnabled} {} {Save console commands to a history file?} {true false} true
+    ;; Console commands can be saved to a file, so the command history persists after a restart. (default is false)
+    ; ConsoleHistoryFileEnabled = true
+
+    ;# {ConsoleHistoryFile} {} {Filename in which to save history} {} OpenSimConsoleHistory.txt
+    ;; 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"
+
+    ;# {ConsoleHistoryFileLines} {} {How many lines of history to save?} {} 100
+    ;; How many lines of command history should we keep? (default is 100)
+    ; ConsoleHistoryFileLines = 100
+
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false
     ;; Set this to true if you want to log crashes to disk
     ;; this can be useful when submitting bug reports.
@@ -69,7 +102,19 @@
 
     ;# {PIDFile} {} {Path to PID file?} {}
     ;; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
+
+    ;# {RegistryLocation} {} {Addins Registry Location} {}
+    ; Set path to directory for addin registry if you want addins outside of bin.  
+    ; 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 = "."
+
+    ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
+    ; 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 = "."
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
     ;; Determine where OpenSimulator looks for the files which tell it
@@ -103,36 +148,36 @@
 
     ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001
     ;; Minimum size for non-physical prims.  Affects resizing of existing 
-    ;; prims.  This can be overriden in the region config file (as 
+    ;; prims.  This can be overridden in the region config file (as 
     ;; NonPhysicalPrimMin!).
     ; NonPhysicalPrimMin = 0.001
 
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
     ;; Maximum size for non-physical prims.  Affects resizing of existing
-    ;; prims. This can be overriden in the region config file (as 
+    ;; prims. This can be overridden in the region config file (as 
     ;; NonPhysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
 
-    ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
-    ;; Maximum size where a prim can be physical.  Affects resizing of
-    ;; existing prims.  This can be overriden in the region config file.
+    ;# {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.
     ; PhysicalPrimMin = 0.01
 
-    ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
+    ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64
     ;; Maximum size where a prim can be physical.  Affects resizing of
-    ;; existing prims.  This can be overriden in the region config file.
-    ; PhysicalPrimMax = 10
+    ;; existing prims.  This can be overridden in the region config file.
+    ; PhysicalPrimMax = 64
 
     ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false
     ;; 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
-        
+
     ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
     ;; 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
 
     ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
@@ -151,12 +196,13 @@
     ;; YOU HAVE BEEN WARNED!!!
     ; TrustBinaries = false
 
-    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content!)} {true false} false
+    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content or varregions!)} {true false} 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
+    ;; Also, this setting should be set to false for varregions as they are proper larger single regions rather than combined smaller regions.
     ; CombineContiguousRegions = false
 
     ;# {InworldRestartShutsDown} {} {Shutdown instance on region restart?} {true false} false
@@ -184,10 +230,6 @@
     ;; if the first change occurred this number of seconds ago.
     ; MaximumTimeBeforePersistenceConsidered = 600
 
-    ;# {see_into_this_sim_from_neighbor} {} {Should avatars in neighbor sims see objects in this sim?} {true false} true
-    ;; Should avatars in neighbor sims see objects in this sim?
-    ; see_into_this_sim_from_neighbor = true
-
     ;# {physical_prim} {} {Allow prims to be physical?} {true false} true
     ;; if you would like to allow prims to be physical and move by physics
     ;; with the physical checkbox in the client set this to true.
@@ -208,91 +250,22 @@
     ; meshing = ZeroMesher
 
     ;; Choose one of the physics engines below
-    ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
-    ;; OpenDynamicsEngine is by some distance the most developed physics engine
-    ;; BulletSim is incomplete and experimental but in active development.  BulletSimN is a purely C# version of BulletSim.
-    ;; basicphysics effectively does not model physics at all, making all
-    ;; objects phantom.   
-    ;; Default is OpenDynamicsEngine
+    ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
+    ;; 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 BulletSim
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
-    ; physics = BulletSimN
     ; physics = basicphysics
     ; physics = POS
 
-    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
-    ;; Permission modules to use, separated by comma.
-    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
-    ; permissionmodules = DefaultPermissionsModule
-
-    ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
-    ;; These are the parameters for the default permissions module
-    ;;
-    ;; If set to false, then, in theory, the server never carries out
-    ;; permission checks (allowing anybody to copy
-    ;; any item, etc.  This may not yet be implemented uniformally.
-    ;; If set to true, then all permissions checks are carried out
-    ; serverside_object_permissions = true
-
-    ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
-    ;; This allows users with a UserLevel of 200 or more to assume god
-    ;; powers in the regions in this simulator.
-    ; allow_grid_gods = false
-
-    ;; This allows some control over permissions
-    ;; please note that this still doesn't duplicate SL, and is not intended to
-    ;# {region_owner_is_god} {} {Allow region owner gods} {true false} true
-    ;; Allow region owners to assume god powers in their regions
-    ; region_owner_is_god = true
-
-    ;# {region_manager_is_god} {} {Allow region manager gods} {true false} false
-    ;; Allow region managers to assume god powers in regions they manage
-    ; region_manager_is_god = false
-
-    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
-    ;; Allow parcel owners to assume god powers in their parcels
-    ; parcel_owner_is_god = true
-
-    ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
-    ;; More control over permissions
-    ;; This is definitely not SL!
-    ;; Provides a simple control for land owners to give build rights to
-    ;; specific avatars in publicly accessible parcels that disallow object
-    ;; creation in general. 
-    ;; Owners specific avatars by adding them to the Access List of the parcel
-    ;; without having to use the Groups feature
-    ; simple_build_permissions = false
-
-
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use. Currently, we only have XEngine
     ; DefaultScriptEngine = "XEngine"
 
-    ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
-    ;; Map tile options. You can choose to generate no map tiles at all,
-    ;; generate normal maptiles, or nominate an uploaded texture to
-    ;; be the map tile
-    ; GenerateMaptiles = true
-
-    ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
-    ;; If desired, a running region can update the map tiles periodically
-    ;; to reflect building activity. This names no sense of you don't have
-    ;; prims on maptiles. Value is in seconds.
-    ; MaptileRefresh = 0
-
-    ;# {MaptileStaticUUID} {} {Asset ID for static map texture} {} 00000000-0000-0000-0000-000000000000
-    ;; If not generating maptiles, use this static texture asset ID
-    ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
-
-    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
-    ;; Use terrain texture for maptiles if true, use shaded green if false
-    ; TextureOnMapTile = true
-
-    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
-    ;; 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
-
     ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
     ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if
     ;; required
@@ -325,6 +298,8 @@
     ;; default is false
     ; TelehubAllowLandmark = false
 
+
+[AccessControl]
     ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
     ;; Bar (|) separated list of viewers which may gain access to the regions.
     ;; One can use a substring of the viewer name to enable only certain
@@ -333,24 +308,118 @@
     ;; - "Imprudence" has access
     ;; - "Imprudence 1.3" has access
     ;; - "Imprudence 1.3.1" has no access
-    ; AllowedViewerList = 
+    ; AllowedClients = ""
 
-    ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
-    ;# Bar (|) separated list of viewers which may not gain access to the regions.
+    ;# {DeniedClients} {} {Bar (|) separated list of denied clients} {}
+    ;; Bar (|) separated list of viewers which may not gain access to the regions.
     ;; 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
-    ; BannedViewerList = 
+        ;;
+    ; DeniedClients = ""
+
+
+[Map]
+    ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
+    ;; 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
+
+    ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
+    ;; 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 = "MapImageModule"
+
+    ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
+    ;; If desired, a running region can update the map tiles periodically
+    ;; to reflect building activity. This names no sense of you don't have
+    ;; prims on maptiles. Value is in seconds.
+    ; MaptileRefresh = 0
+
+    ;# {MaptileStaticUUID} {} {Asset ID for static map texture} {} 00000000-0000-0000-0000-000000000000
+    ;; If not generating maptiles, use this static texture asset ID
+    ;; This may be overridden on a per region basis in Regions.ini
+    ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
+
+    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
+    ;; Use terrain texture for maptiles if true, use shaded green if false
+    ; TextureOnMapTile = true
+
+    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
+    ;; 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
+
+    ;# {TexturePrims} {} {Texture prims on map tiles?} {true false} true
+    ;; Texture the faces of the prims that are rendered on the map tiles.
+    ; TexturePrims = true
+
+    ;# {TexturePrimSize} {} {Size of prims to texture faces?} {} 48
+    ;; Only texture prims that have a diagonal size greater than this number
+    ; TexturePrimSize = 48
+
+    ;# {RenderMeshes} {} {Render meshes and sculpties on map tiles?} {true false} false
+    ;; Attempt to render meshes and sculpties on the map
+    ; RenderMeshes = false;
+
+
+[Permissions]
+    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
+    ;; Permission modules to use, separated by comma.
+    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
+    ; permissionmodules = DefaultPermissionsModule
+
+    ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
+    ;; These are the parameters for the default permissions module
+    ;;
+    ;; If set to false, then, in theory, the server never carries out
+    ;; permission checks (allowing anybody to copy
+    ;; any item, etc.  This may not yet be implemented uniformally.
+    ;; If set to true, then all permissions checks are carried out
+    ; serverside_object_permissions = true
+
+    ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
+    ;; This allows users with a UserLevel of 200 or more to assume god
+    ;; powers in the regions in this simulator.
+    ; allow_grid_gods = false
+
+    ;; This allows some control over permissions
+    ;; please note that this still doesn't duplicate SL, and is not intended to
+    ;# {region_owner_is_god} {} {Allow region owner gods} {true false} true
+    ;; Allow region owners to assume god powers in their regions
+    ; region_owner_is_god = true
+
+    ;# {region_manager_is_god} {} {Allow region manager gods} {true false} false
+    ;; Allow region managers to assume god powers in regions they manage
+    ; region_manager_is_god = false
+
+    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
+    ;; Allow parcel owners to assume god powers in their parcels
+    ; parcel_owner_is_god = true
+
+    ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
+    ;; More control over permissions
+    ;; This is definitely not SL!
+    ;; Provides a simple control for land owners to give build rights to
+    ;; specific avatars in publicly accessible parcels that disallow object
+    ;; creation in general. 
+    ;; Owners specific avatars by adding them to the Access List of the parcel
+    ;; without having to use the Groups feature
+    ; simple_build_permissions = false
 
 
 [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.
+    ; 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
@@ -360,7 +429,7 @@
     ; DefaultEstateOwnerName = FirstName LastName
 
 
-    ; ** Standalone Estate Settings **  
+    ; ** Standalone Estate Settings **
     ; The following parameters will only be used on a standalone system to 
     ; create an estate owner that does not already exist
 
@@ -410,8 +479,8 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-[Network]
 
+[Network]
     ;# {ConsoleUser} {} {User name for console account} {}
     ;; Configure the remote console user here. This will not actually be used
     ;; unless you use -console=rest at startup.
@@ -427,6 +496,32 @@
     ;; the region ports use UDP.
     ; http_listener_port = 9000
 
+    ; 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
+
     ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
     ;; Hostname to use in llRequestURL/llRequestSecureURL
     ;; if not defined - default machine name is being used
@@ -448,6 +543,17 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+    ;; The follow 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.
+
+
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
     ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
@@ -462,7 +568,7 @@
     ;# {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
+    ;# {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 
@@ -495,25 +601,26 @@
     ;;   "<url>" -- capability enabled and served by some other server
     ;;
     ; These are enabled by default to localhost. Change if you see fit.
-      Cap_GetTexture = "localhost"
+    Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
-    ; This is disabled by default. Change if you see fit. Note that
-    ; serving this cap from the simulators may lead to poor performace.
-    Cap_WebFetchInventoryDescendents = ""
+    Cap_AvatarPickerSearch = "localhost"
+    Cap_GetDisplayNames = "localhost"
 
 
 [SimulatorFeatures]
 
-    ;# {MapImageServerURI} {} {URL for the map server} {}
-    ; Experimental new information sent in SimulatorFeatures cap for Kokua
-    ; viewers 
-    ; meant to override the MapImage and search server url given at login, and varying 
-    ; on a sim-basis.
-    ; Viewers that don't understand it, will ignore it
-    ;MapImageServerURI = "http://127.0.0.1:9000/"
     ;# {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]
     ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
@@ -524,20 +631,34 @@
     ;; Distance in meters that ordinary chat should travel.
     ; say_distance = 20
 
-    ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100
+    ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
     ;; Distance in meters that shouts should travel.
     ; shout_distance = 100
 
 
+[EntityTransfer]
+    ;# {DisableInterRegionTeleportCancellation} {} {Determine whether the cancel button is shown at all during teleports.} {false true} false
+    ;; 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]
-    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule *}
+    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
     ;; Module to handle offline messaging. The core module requires an external
     ;; web service to do this. See OpenSim wiki.
     ; OfflineMessageModule = OfflineMessageModule
+    ;; Or, alternatively, use this one, which works for both standalones and grids
+    ; OfflineMessageModule = "Offline Message Module V2"
+
+    ;# {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|BaseURL}/Offline.php
+    ; OfflineMessageURL = ${Const|BaseURL}:${Const|PrivatePort}
 
-    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {}
-    ;; URL of web service for offline message storage
-    ; OfflineMessageURL = http://yourserver/Offline.php
+    ;# {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
@@ -549,12 +670,17 @@
     ;; must be set to allow offline messaging to work.
     ; MuteListURL = http://yourserver/Mute.php
 
-    ;; Control whether group messages are forwarded to offline users.
+    ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
+    ;; This applies to both core groups module.
     ; ForwardOfflineGroupMessages = true
 
 
+[BulletSim]
+    ;# {AvatarToAvatarCollisionsByDefault} {[Startup]physics:BulletSim} {Should avatars collide with each other?} {true false} true
+    AvatarToAvatarCollisionsByDefault = true
+
+
 [ODEPhysicsSettings]
     ;# {mesh_sculpted_prim} {[Startup]physics:OpenDynamicsEngine} {Mesh sculpties so they collide as they look?} {true false} true
     ;; Do we want to mesh sculpted prim to collide like they look?
@@ -586,7 +712,8 @@
     ;; the "password" parameter)
     ; access_password = ""
 
-    ;# List the IP addresses allowed to call RemoteAdmin
+    ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
+    ;; List the IP addresses allowed to call RemoteAdmin
     ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
     ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
     ; access_ip_addresses =
@@ -667,6 +794,12 @@
     ; enable_windlight = false
 
 
+[Materials]
+    ;# {enable_materials} {} {Enable Materials support?} {true false} true
+    ;; This enables the use of Materials.
+    ; enable_materials = true
+    ; MaxMaterialsPerTransaction = 50
+
 [DataSnapshot]
     ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
     ;; The following set of configs pertains to search.
@@ -697,12 +830,15 @@
     ;; the data snapshots.
     ; snapshot_cache_directory = "DataSnapshot"
 
+    ;; [Supported, but obsolete]
     ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
     ; 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"
 
+    ;; New way of specifying data services, one per service
+    ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
     ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
@@ -749,13 +885,6 @@
     ;; The trade-off may be increased memory usage by the script engine.
     ; ThreadStackSize = 262144
 
-    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) 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 = true
-
     ;; Set this to true (the default) to load each script into a separate
     ;; AppDomain. 
     ;;
@@ -768,13 +897,30 @@
     ;; Some Windows users have also reported script loading problems when AppDomainLoading = false
     ; AppDomainLoading = true
 
+    ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 
+    ;; co-op will be more stable but this option is currently experimental.
+    ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
+    ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run  
+    ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
+    ;; Current valid values are "abort" and "co-op"
+    ; ScriptStopStrategy = abort
+    
+
+    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} 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 = true
+
     ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl
     ;; Default language for scripts
     ; DefaultCompileLanguage = "lsl"
 
     ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl
     ;; List of allowed languages (lsl,vb,cs)
-    ;; AllowedCompilers=lsl,cs,js,vb.
+    ;; 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"
@@ -782,53 +928,7 @@
     ;; Compile debug info (line numbers) into the script assemblies
     ; CompileWithDebugInformation = 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 = false
-
-    ;# {AllowOSFunctions} {Enabled:true} {Allow OSFunctions? (DANGEROUS!)} {true false} false
-    ;; Allow the use of os* functions (some are dangerous)
-    ; AllowOSFunctions = false
-
-    ;# {AllowLightShareFunctions} {Enabled:false [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} false
-    ; Allow the use of LightShare functions.
-    ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
-    ; AllowLightShareFunctions = false
-
-    ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
-    ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
-    ;; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
-    ;; We do not recommend that use set a general level above Low unless you have a high level of trust
-    ;; in all the users that can run scripts in your simulator.  It is safer to explicitly
-    ;; allow certain types of user to run higher threat level OSSL functions, as detailed later on.
-    OSFunctionThreatLevel = VeryLow
-
-    ; 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 the object group is the same group as the parcel
-    ; - PARCEL_OWNER:         allow if the object owner is the parcel owner
-    ; - ESTATE_MANAGER:       allow if the object owner is an estate manager
-    ; - ESTATE_OWNER:         allow if the object owner is the estate owner
-    ; 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.
+    ; ==== Settings for MOD and OSSL functions have been moved to the [OSSL] section
 
     ;# {EventLimit} {} {Amount of time a script can spend in an event handler} {} 30
     ;; Time a script can spend in an event handler before it is interrupted
@@ -869,6 +969,12 @@
     ;; Default is ./bin/ScriptEngines
     ; ScriptEnginesPath = "ScriptEngines"
 
+[OSSL]
+    ;# {Include-osslEnable} {} {Include file for enabling and permissions for OSSL functions} {}
+    ;; Optionally include file to enable OSSL functions and set permissions on who can use which.
+    ;; If this INI file is not included, the OSSL functions are disabled.
+    Include-osslEnable = "config-include/osslEnable.ini"
+
 
 [MRM]
     ;; Enables the Mini Region Modules Script Engine.
@@ -914,44 +1020,83 @@
     ;; Enables the groups module
     ; Enabled = false
 
-    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default
-    ;; This is the current groups stub in Region.CoreModules.Avatar.Groups.
-    ;; All the other settings below only really apply to the Flotsam/SimianGrid
-    ;; GroupsModule.
-    ;; This module can use a PHP XmlRpc server from the Flotsam project at
+    ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
+    ;; Minimum user level required to create groups
+    ; LevelGroupCreate = 0
+
+    ;# {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
     ; Module = Default
+    ;; or... use Groups Module V2, which works for standalones and robust grids
+    ; 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
+
+    ;# {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:
+    ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
+    ;; -- for Simian Groups use SimianGroupsServicesConnector
+    ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
+    ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
+    ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
+    ;; Note that the quotes "" around the words are important!
+    ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
-    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
-    ; MessagingEnabled = true
-
-    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
-    ; MessagingModule = GroupsMessagingModule
+    ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
+    ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ; LocalService = local
 
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
-    ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
-    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-    ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
+    ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} ""
+    ;; Used for V2 in Remote only. 
+    ; SecretKey = ""
 
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
-    ;; URI for the groups services
+    ;# {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|BaseURL}:${Const|PrivatePort} for robust, V2
+    ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
-    ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
+    ;# {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 = "" 
+
+    ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
+    ; MessagingEnabled = true
+
+    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
+    ; MessagingModule = GroupsMessagingModule
+    ; 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
 
-    ;; This makes the Groups modules very chatty on the console.
+    ;# {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
+    ; MessageOnlineUsersOnly = false
+
+    ;; This makes the Group module very chatty on the console.
     ; DebugEnabled = false
 
+    ; This makes the Group Messaging module very chatty on the console.
+    ; DebugMessagingEnabled = false
+
     ;; XmlRpc Security settings.  These must match those set on your backend
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
+
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -970,10 +1115,33 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
+
 [Terrain]
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
+
+[UserProfiles]
+  ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort}
+
+[XBakes]
+  ;# {URL} {} {Set URL for Baked texture service} {}
+  ;; 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"
+
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,