fix merge issue

14 files changed, 313 insertions, 313 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index dca6413..d9671f4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,6 +1,6 @@
 ;; This is the main configuration file for OpenSimulator.
 ;; If it's named OpenSim.ini then it will be loaded by OpenSimulator.
-;; If it's named OpenSim.ini.example then you will need to copy it to 
+;; 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)
 ;;
 ;; Once you have copied OpenSim.ini.example to OpenSim.ini you will at least
@@ -10,19 +10,19 @@
 ;; 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, 
+;; The settings in this file are in the form "<key> = <value>".  For example,
 ;; save_crashes = false in the [Startup] section below.
 ;;
-;; All settings are initially commented out and the default value used, as 
-;; found in OpenSimDefaults.ini.  To change a setting, first uncomment it by 
+;; All settings are initially commented out and the default value used, as
+;; found in OpenSimDefaults.ini.  To change a setting, first uncomment it by
 ;; deleting the initial semicolon (;) and then change the value.  This will
 ;; override the value in OpenSimDefaults.ini
-;; 
+;;
 ;; If you want to find out what configuration OpenSimulator has finished with
 ;; once all the configuration files are loaded then type "config show" on the
 ;; region console command line.
 ;;
-;; 
+;;
 ;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
 ;;
 ;; All leading white space is ignored, but preserved.
@@ -41,7 +41,7 @@
 ;;    satisfied.
 ;;
 ;; ;  denotes a commented out option.
-;;    Any options added to OpenSim.ini.example should be initially commented 
+;;    Any options added to OpenSim.ini.example should be initially commented
 ;;    out.
 
 
@@ -51,10 +51,10 @@
 
     ;# {BaseHostname} {} {BaseHostname} {"example.com" "127.0.0.1"} "127.0.0.1"
     BaseHostname = "127.0.0.1"
-    
+
     ;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname}} "http://${Const|BaseHostname}"
     BaseURL = http://${Const|BaseHostname}
-    
+
     ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
     PublicPort = "8002"
 
@@ -108,14 +108,14 @@
     ; 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 
+    ; 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 
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access
     ; to the location.
     ; ConfigDirectory = "."
 
@@ -125,7 +125,7 @@
     ;; Default is "filesystem"
     ; region_info_source = "filesystem"
     ; region_info_source = "web"
-    
+
     ;# {regionload_regionsdir} {region_info_source} {Location of file?} {} Regions
     ;; Determines where the region XML files are stored if you are loading
     ;; these from the filesystem.
@@ -146,14 +146,14 @@
     ; allow_regionless = false
 
     ;# {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 
+    ;; Minimum size for non-physical prims.  Affects resizing of existing
+    ;; 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 overridden in the region config file (as 
+    ;; prims. This can be overridden in the region config file (as
     ;; NonPhysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
 
@@ -183,7 +183,7 @@
     ;; 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.  
+    ;; simulator.
     ;; For crossings where the regions are on the same simulator the script is
     ;; always kept running.
     ; AllowScriptCrossing = true
@@ -240,14 +240,14 @@
     ; meshing = ZeroMesher
         ;; select ubODEMeshmerizer only with ubOde physics engine
     ; meshing = ubODEMeshmerizer
-        
+
     ;; Choose one of the physics engines below
     ;# {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.  
+    ;; 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.   
+    ;; basicphysics effectively does not model physics at all, making all objects phantom.
     ;; Default is BulletSim
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
@@ -259,7 +259,7 @@
     ; 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
-    
+
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use (Xengine if all commented)
     ; DefaultScriptEngine = "XEngine"
@@ -337,16 +337,16 @@
 
 [Map]
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
-    ;; Map tile options.  
+    ;; 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 
+    ;; 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 
+    ;; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can
     ;; generate better images.
     ;MapImageModule = "MapImageModule"
 
@@ -433,7 +433,7 @@
     ;; 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. 
+    ;; 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
@@ -454,12 +454,12 @@
 
 
     ; ** Standalone Estate Settings **
-    ; The following parameters will only be used on a standalone system to 
+    ; 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 
+    ;; 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?} {}
@@ -555,11 +555,11 @@
     ; 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.
@@ -576,7 +576,7 @@
     ;# {HttpBodyMaxLenMAX} {} {Maximum bytes allowed for HTTP_BODY_MAXLENGTH} {} 16384
     ;; 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. 
+    ;; 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
@@ -588,7 +588,7 @@
     ;; Hostname to use in llRequestURL/llRequestSecureURL
     ;; if not defined - llRequestURL/llRequestSecureURL are disabled
     ExternalHostNameForLSL = ${Const|BaseHostname}
-    
+
     ;# {shard} {} {Name to use for X-Secondlife-Shard header? (press enter if unsure)} {} OpenSim
     ;; What is reported as the "X-Secondlife-Shard"
     ;; Defaults to the user server url if not set
@@ -600,7 +600,7 @@
     ;; What is reported as the "User-Agent" when using llHTTPRequest
     ;; Defaults to not sent if not set here. See the notes section in the wiki
     ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
-    ;; " (Mozilla Compatible)" to the text where there are problems with a 
+    ;; " (Mozilla Compatible)" to the text where there are problems with a
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
@@ -617,9 +617,9 @@
 
 [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 
+    ;; 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
@@ -632,7 +632,7 @@
     ;# {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 
+    ;; service
     ; XmlRpcHubURI = http://example.com
 
 
@@ -732,7 +732,7 @@
         ; 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
 
@@ -753,7 +753,7 @@
 [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?
-    ;; If you are seeing sculpt texture decode problems 
+    ;; 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
@@ -906,7 +906,7 @@
     ; the economy module in use
     ; To use other modules you need to override this setting
     ; economymodule = BetaGridLikeMoneyModule
-    
+
     ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
     ; 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.
@@ -956,7 +956,7 @@
 
         ;; llSetTimerEvent minimum value. Default 0.5s, 0.05s whould be more resonable
         ; MinTimerInterval = 0.5
-        
+
     ;# {Priority} {Enabled:true} {Priority for script engine threads?} {Lowest BelowNormal Normal AboveNormal Highest} BelowNormal
     ;; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal",
     ;; "Highest")
@@ -971,7 +971,7 @@
     ; ThreadStackSize = 262144
 
     ;; Set this to true to load each script into a separate
-    ;; AppDomain. 
+    ;; AppDomain.
     ;;
     ;; Setting this to false will load all script assemblies into the
     ;; current AppDomain, which will significantly improve script loading times.
@@ -984,15 +984,15 @@
     ;; this should only be a issue if regions stay alive for a long time with lots of scripts added or edited.
     ; AppDomainLoading = false
 
-    ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 
+    ;; 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  
+    ;; 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 = co-op
-    
+
 
     ;# {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
@@ -1007,7 +1007,7 @@
     ;; 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 (as with DeleteScriptsOnStartup = true)
     ;CompactMemOnLoad = false
-    
+
     ;; Compile debug info (line numbers) into the script assemblies
     ; CompileWithDebugInformation = true
 
@@ -1115,7 +1115,7 @@
     ;; 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} {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
@@ -1133,7 +1133,7 @@
     ; LocalService = local
 
     ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} ""
-    ;; Used for V2 in Remote only. 
+    ;; Used for V2 in Remote only.
     ; SecretKey = ""
 
     ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
@@ -1144,11 +1144,11 @@
     ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
-    ;# {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 = ""
 
     ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
     ; MessagingEnabled = true
@@ -1189,7 +1189,7 @@
 
         ; TEST OPTION KEEP AS FALSE
         ; if true, don't send object updates if outside view range
-        ; ObjectsCullingByDistance = false       
+        ; ObjectsCullingByDistance = false
 
 [MediaOnAPrim]
     ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true
@@ -1200,24 +1200,24 @@
 [NPC]
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
-        
+
         ;; several options to control NPCs creation
-        
+
     ;# {AllowNotOwned} {} {allow NPCs to be created not Owned} {true false} true
         ;; allow NPCs to be created not Owned {true false} default: true
     ; AllowNotOwned = true
-        
+
     ;# {AllowSenseAsAvatar} {} {allow NPCs to set to be sensed as Avatars} {true false} true
         ;; allow NPCs to set to be sensed as Avatars {true false} default: true
     ; AllowSenseAsAvatar = true
-        
+
     ;# {AllowCloneOtherAvatars} {} {allow NPCs to created cloning any avatar in region} {true false} true
         ;; allow NPCs to created cloning any avatar in region {true false} default: true
     ; AllowCloneOtherAvatars = true
-        
+
     ;# {NoNPCGroup} {} {if true NPCs will have no group title, if false display "- NPC -"} {true false} true
         ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
-    ; NoNPCGroup = true 
+    ; NoNPCGroup = true
 
 
 [Terrain]
@@ -1227,13 +1227,13 @@
 [LandManagement]
         ;; set this to false to not display parcel ban lines
         ;ShowParcelBansLines = true
-        
+
 [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}
-  
+
   ;# {AllowUserProfileWebURLs} {} {allow user profiles web urls} {true false} true
   ;; set this to false to prevent your users to be sent to unknown
   ;; web sites by other users on their profiles
@@ -1258,11 +1258,11 @@
     ;# {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,
     ;; uncomment Include-Architecture = "config-include/Standalone.ini"
-    ;; 
+    ;;
     ;; Then you will need to copy and edit the corresponding *Common.example file in config-include/
     ;; that the referenced .ini file goes on to include.
     ;;
-    ;; For instance, if you chose "config-include/Standalone.ini" then you will need to copy 
+    ;; For instance, if you chose "config-include/Standalone.ini" then you will need to copy
     ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before
     ;; editing it to set the database and backend services that OpenSim will use.
     ;;
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 61d7098..f960b94 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -4,7 +4,7 @@
 [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) "
@@ -61,7 +61,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
@@ -75,13 +75,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 = "."
 
@@ -108,7 +108,7 @@
     ; 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.
@@ -122,13 +122,13 @@
         ;; 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 = true;
-        
+        ; LegacySitOffsets = true
+
     ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
     ; Increasing this number will increase memory usage.
     MaxPrimUndos = 20
 
-    ; Minimum size for non-physical prims.This can be overridden in the region config file (as 
+    ; Minimum size for non-physical prims.This can be overridden in the region config file (as
     ; NonPhysicalPrimMin!).
     ; NonPhysicalPrimMin = 0.001
 
@@ -137,7 +137,7 @@
 
     ; 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.
     PhysicalPrimMax = 64
 
@@ -153,7 +153,7 @@
     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
 
@@ -168,14 +168,14 @@
 
         ; limit the maximum view range ( no effect still (does limit MaxRegionsViewDistance) )
         MaxDrawDistance = 512
-        
+
         ; 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 = 255
-        
+
     ; 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
     ; true to make the entire instance exit instead of restarting the region.
@@ -193,7 +193,7 @@
         ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
         ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false.
         ; Normalized55FPS = true
-        
+
     ; Main Frame time
         ; This defines the rate of several simulation events.
         ; Default value should meet most needs.
@@ -208,44 +208,44 @@
     ; 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;
+    ; This must be a whole number
+    UpdateObjectsEveryNFrames = 1
 
     ; Send position/velocity, etc. updates to agents in the scene
-    ; This must be a whole number 
-    UpdateAgentsEveryNFrames = 1;
+    ; This must be a whole number
+    UpdateAgentsEveryNFrames = 1
 
     ; Apply pending forces from physics calculations to an entity.
-    ; This must be a whole number 
-    UpdateEntityMovementEveryNFrames = 1;
+    ; This must be a whole number
+    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
 
     ; 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
@@ -283,23 +283,23 @@
 
     meshing = Meshmerizer
     ;meshing = ZeroMesher
-    
+
     ; Path to decoded sculpty maps
     ; Defaults to "j2kDecodeCache
     ;DecodedSculptMapPath = "j2kDecodeCache"
-    
+
     ; if you use Meshmerizer and want sculpt map collisions, setting this to
     ; to true will store decoded sculpt maps in a special folder in your bin
     ; folder, which can reduce startup times by reducing asset requests. Some
     ; versions of mono dont work well when reading the cache files, so set this
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
-    
+
     ;; 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.   
+    ;; basicphysics effectively does not model physics at all, making all objects phantom.
     ;; Default is BulletSim
     physics = BulletSim
     ;physics = modified_BulletX
@@ -324,14 +324,14 @@
     ; 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
-    
+
     ; ##
     ; ## ANIMATIONS
     ; ##
@@ -343,11 +343,11 @@
     ; PreJump is an additional animation state, but it probably
     ; won't look right until the physics engine supports it
     ; (i.e delays takeoff for a moment)
-    
+
     ; #
     ; # statistics
-    ; # 
-    
+    ; #
+
     ; Simulator statistics are output to the console periodically at debug level INFO.
     ; Setting this to zero disables this output.
     ; LogShowStatsSeconds = 3600
@@ -413,20 +413,20 @@
     ; NoVerifyCertHostname = true
     ; having both options true does provide encryption but with low security
     ; set both true if you don't care to use SSL, they are needed to contact regions or grids that do use it.
-    
+
 [Map]
-    ; Map tile options.  
+    ; 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 
+    ; 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 is the default.  Warp3DImageModule is an alternative experimental module that can
+    ; generate better images.
     ;MapImageModule = "MapImageModule"
 
     ; World map blacklist timeout in seconds
@@ -452,7 +452,7 @@
     TexturePrimSize = 48
 
     ; Attempt to render meshes and sculpties on the map
-    RenderMeshes = false;
+    RenderMeshes = false
 
 [Permissions]
     ; ##
@@ -469,14 +469,14 @@
     ; Default is true
     serverside_object_permissions = true
 
-    
+
     ; This allows some control over permissions
     ; please note that this still doesn't duplicate SL, and is not intended to
-    
+
     ; This allows grid users with a UserLevel of 200 or more to assume god
-    ; powers in the regions in this simulator.    
+    ; powers in the regions in this simulator.
     allow_grid_gods = false
-    
+
     ; Allow region owners to assume god powers in their regions
     ;region_owner_is_god = true
 
@@ -512,7 +512,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
@@ -553,12 +553,12 @@
   ;; 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 
+  ;; 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
-  
+
   ;; set this to false to prevent your users to be sent to unknown
   ;; web sites by other users on their profiles
   ; AllowUserProfileWebURLs = true
@@ -609,7 +609,7 @@
     ; 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. 
+    ; of HttpBodyMaxLenMAX bytes.
     ; HttpBodyMaxLenMAX=16384
 
     ; Hostname to use in llRequestURL/llRequestSecureURL
@@ -636,7 +636,7 @@
     ; You can also disable the blacklist entirely with an empty entry
     ;
     ; OutboundDisallowForUserScripts = ""
-  
+
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
     ; The old default is "OpenSim", set here for compatibility
@@ -657,7 +657,7 @@
         ; Viewer-based access control. |-separated list of allowed viewers.
     ; AllowedClients = ""
 
-        ; Viewer-based access control. |-separated list of denied viewers. 
+        ; Viewer-based access control. |-separated list of denied viewers.
         ; No restrictions by default.
     ; DeniedClients = ""
 
@@ -695,7 +695,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.
     ;
@@ -772,7 +772,7 @@
 
 
 [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
@@ -847,10 +847,10 @@
     ; Capability for searching for people
     Cap_AvatarPickerSearch = "localhost"
 
-    
+
 [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
@@ -862,8 +862,8 @@
     shout_distance = 100
 
 [EntityTransfer]
-    ; The maximum distance in regions that an agent is allowed to teleport 
-    ; along the x or y axis. This is set to 65535 because current viewers 
+    ; 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
     ;
@@ -873,7 +873,7 @@
     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. 
+        ; the region's border without being transferred to another simulator.
         DisableObjectTransfer = false
 
     ; Minimum user level required for HyperGrid teleports
@@ -913,7 +913,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
@@ -927,11 +927,11 @@
     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 = false
 
-    ; 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 = false
 
@@ -945,7 +945,7 @@
     ; 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]
@@ -963,20 +963,20 @@
     ;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;
+    ;MeshFileCacheDoExpire = true
     ;MeshFileCacheExpireHours = 48
-    
+
 
 
 [Textures]
@@ -998,7 +998,7 @@
 
 
 [ODEPhysicsSettings]
-    ; ## 
+    ; ##
     ; ## Physics stats settings ( most ignored by ubOde )
     ;
 
@@ -1031,7 +1031,7 @@
     ; Max value is 255, min value is 0
     avatar_terminal_velocity = 54
 
-    ; World Step size. 
+    ; 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
@@ -1048,7 +1048,7 @@
     world_hashSpace_level_high = 12
 
     meters_in_small_space = 29.9
- 
+
 
     ; ##
     ; ## Contact properties. (the stuff that happens when things come in contact with each other)
@@ -1088,7 +1088,7 @@
     ; See http://en.wikipedia.org/wiki/PID_controller
 
     av_pid_derivative = 2200.0
-    av_pid_proportional = 900.0;
+    av_pid_proportional = 900.0
 
     ;girth of the avatar.  Adds radius to the height also
     av_capsule_radius = 0.37
@@ -1121,8 +1121,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
 
@@ -1174,7 +1174,7 @@
 
     ; Physics needs to create internal meshs (or convert the object meshs or scultps)
     ; for all prims except simple boxes and spheres.
-    
+
     ; 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
@@ -1263,7 +1263,7 @@
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
-    
+
 
 [RemoteAdmin]
     enabled = false
@@ -1325,7 +1325,7 @@
     ;copy_folders = false
 
     ; 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.
@@ -1485,17 +1485,17 @@
 [Trees]
     ; 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 
+    update_rate = 1000
 
     ; allow the trees to grow.
     ; DANGER
-    ; this option causes high network use on the order of 
+    ; this option causes high network use on the order of
     ; NumberOfTrees * NumberAvatars * 1000 / update_rate udp packets per second
     allowGrow = false
 
@@ -1525,7 +1525,7 @@
     ; Maximum number of llListen events we allow per script
     ; Set this to 0 to have no limit imposed.
     max_listens_per_script = 64
-  
+
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
@@ -1723,7 +1723,7 @@
     ; data service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
-    
+
 [Economy]
     ; the economy module in use
     ; default is the provided BetaGridLikeMoneyModule
@@ -1743,10 +1743,10 @@
     ; 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.
@@ -1810,8 +1810,8 @@
     ; 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) 
+
+    ; 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.
@@ -1837,7 +1837,7 @@
 
     ; Allow the use of os* functions (some are dangerous)
     AllowOSFunctions = false
-    
+
     ; Allow the user of LightShare functions
     AllowLightShareFunctions = false
 
@@ -1856,7 +1856,7 @@
 
     ; 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
@@ -1884,7 +1884,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
 
     ; Sets the multiplier for the scripting delays
     ScriptDelayFactor = 1.0
@@ -1914,7 +1914,7 @@
     ; prims
     ; DisableUndergroundMovement = true
 
-    ;; Path to script assemblies 
+    ;; Path to script assemblies
     ; ScriptEnginesPath = "ScriptEngines"
 
 
@@ -2051,7 +2051,7 @@
     ;Module  = GroupsModule
 
     ; Enable Group Notices
-    ;NoticesEnabled   = true 
+    ;NoticesEnabled   = true
 
     ; This makes the Group module very chatty on the console.
     DebugEnabled     = false
@@ -2066,7 +2066,7 @@
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
     ;MessagingModule = GroupsMessagingModule
-    ;MessagingEnabled = true 
+    ;MessagingEnabled = true
 
     ; 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
@@ -2074,7 +2074,7 @@
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-  
+
     ; SimianGrid Service for Groups
     ;ServicesConnectorModule = SimianGroupsServicesConnector
     ;GroupsServerURI = http://mygridserver.com:82/Grid/
@@ -2084,8 +2084,8 @@
     ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
 
     ; XmlRpc Security settings.  These must match those set on your backend groups service if the service is using these keys
-    ;XmlRpcServiceReadKey    = 1234 
-    ;XmlRpcServiceWriteKey   = 1234 
+    ;XmlRpcServiceReadKey    = 1234
+    ;XmlRpcServiceWriteKey   = 1234
 
     ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
         ; only set to false it if you absolute sure regions and groups server support it.
@@ -2096,8 +2096,8 @@
 
 
 [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
@@ -2113,7 +2113,7 @@
     ReprioritizationInterval = 2000.0
     RootReprioritizationDistance = 10.0
     ChildReprioritizationDistance = 20.0
-        
+
         ; TEST OPTION KEEP AS FALSE
         ; if true, don't send object updates if outside view range
         ObjectsCullingByDistance = false
@@ -2126,7 +2126,7 @@
     ; If n > 1, only every n UDP terse updates will be sent to observers of an avatar that are in another region
     ; n > 1 will reduce UDP traffic but may lead to laggier movement observed in other avatars, though values up to 4 may not generate a noticeable effect.
     ChildTerseUpdatePeriod = 0
-    
+
     ; Send an update to clients if the difference from the last sent avatar position is greater than this tolerance
     RootPositionUpdateTolerance = 0.05
 
@@ -2153,31 +2153,31 @@
     ; enabled=false
 
 [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
 
 
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
         ;; several options to control NPCs creation
-        
+
         ;; allow NPCs to be created not Owned {true false} default: true
     ; AllowNotOwned = true
-        
+
         ;; 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
-        
+
         ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
-    ; NoNPCGroup = true 
+    ; NoNPCGroup = true
 
 [Terrain]
     ; Values can be "pinhead-island" or "flat"
@@ -2198,11 +2198,11 @@
     ;   whole region.
     LimitParcelLayerUpdateDistance = true
     ParcelLayerViewDistance = 128
-        
+
         ; 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
 ;;
@@ -2213,8 +2213,8 @@
 
 
 ;;
-;; JsonStore module provides structured store for scripts 
-;; 
+;; JsonStore module provides structured store for scripts
+;;
 [JsonStore]
     Enabled = False
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index a327c6b..3335120 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -3,30 +3,30 @@
 ; *
 
 ; * Configurations for enabling HG1.5
-; * 
+; *
 ; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
 ; *                     OpenSim.Server.Handlers.dll:UserAgentService
-; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and 
-; *            OpenSim.Server.Handlers.dll:XInventoryInConnector 
+; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
+; *            OpenSim.Server.Handlers.dll:XInventoryInConnector
 ; * are started in port 8002, outside the firewall
 ; *
 ; **
 ; *
 ; * The Const section allows us to define some basic information that we
-; * will use throughout our configuration. We will provide examples for 
+; * will use throughout our configuration. We will provide examples for
 ; * setting the base url of the Robust server and the public and private ports
 ; * it uses. Changing the values of the constants will set the operating
 ; * parameters thoughout the configuration. Other constants that may prove
-; * to be useful may be added to the followin section. They may be 
+; * to be useful may be added to the followin section. They may be
 ; * referenced anywhere in the configuration by using ${Const|Name}. One
 ; * such use is providing a base path for setting locations that Robust
 ; * uses to write data.
-; * 
+; *
 [Const]
 
     ; The URL of the Robust server
     BaseURL = "http://127.0.0.1"
-    
+
     ; The public port of the Robust server
     PublicPort = "8002"
 
@@ -52,12 +52,12 @@
     ; Set path to directory for plugin registry. Information
     ; about the registered repositories and installed plugins
     ; will be stored here
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     RegistryLocation = "."
 
     ; Modular configurations
     ; Set path to directory for modular ini files...
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     ConfigDirectory = "robust-include"
 
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
@@ -161,7 +161,7 @@
     ;; This is useful in cases where you want to protect most of the services,
     ;; but unprotect individual services. Username and Password can also be
     ;; overriden if you want to use different credentials for the different services.
-    ;; Hypergrid services are not affected by this; they are publicly available 
+    ;; Hypergrid services are not affected by this; they are publicly available
     ;; by design.
 
     ;; By default, scripts are not allowed to call private services via llHttpRequest()
@@ -239,27 +239,27 @@
     ;; Choose an asset service (Only one option should be enabled)
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
-    
+
     ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
     ;; These directories must be on the same physical filesystem
     ;BaseDirectory = "./fsassets/data"
     ;SpoolDirectory = "./fsassets/tmp"
-    
+
     ;; Original service can be checked if FSAssets can not find an asset
     ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
-    
+
     ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
     ;; Reduces DB calls if asset is requested often. Default value 0 will always update access time
     ;DaysBetweenAccessTimeUpdates = 30
-    
+
     ;; Should FSAssets print read/write stats to the robust console, default is true
     ;ShowConsoleStats = true
-    
+
     ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
     ;StorageProvider = ""
     ;ConnectionString = ""
     ;Realm = "fsassets"
-    
+
     ;; The following are common to both the default asset service and FSAsset service
 
     ;; Common asset service options
@@ -297,7 +297,7 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 
-    ; Realm = "regions"   
+    ; Realm = "regions"
     ; AllowDuplicateNames = ""
 
     ;; Perform distance check for the creation of a linked region
@@ -308,25 +308,25 @@
 
     ;; Directory for map tile images of linked regions
     ; MapTileDirectory = "./maptiles"
- 
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
     ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate
-    ;;  
+    ;;
     ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
     ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
     ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
     ;;                  an explicit region.
-    ;;  
+    ;;
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
-    ;;  
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
-    ;;  
+    ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
-    ;;  
+    ;;
     ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
     ;;
     ;; Example specification:
@@ -375,19 +375,19 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
 
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. 
+; * is implemented.
 ; *
 [AuthenticationService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ; Realm = "useraccounts"
+    ; Realm = "auth"
 
     ;; Allow the service to process HTTP getauthinfo calls.
     ;; Default is false.
@@ -410,13 +410,13 @@
 
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
-; * It defaults to "useraccounts", which uses the new style.
+; * It defaults to "UserAccounts", which uses the new style.
 ; * Realm = "users" will use the legacy tables as an authentication source
 ; *
 [UserAccountService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; Realm = "useraccounts"
+    ; Realm = "UserAccounts"
 
     ; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -426,7 +426,7 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
     CreateDefaultAvatarEntries = true
@@ -540,8 +540,8 @@
     ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
-    ;; Options are 
-    ;;   "none"     no DST 
+    ;; Options are
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -562,7 +562,7 @@
     ;;
     ;; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ;DOSForgiveClientAfterMS = 120000
-    ;; 
+    ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 
@@ -642,10 +642,10 @@
     ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
-    ; Does this grid allow incoming links to any region in it? 
+    ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
-    
+
     ; If you run this gatekeeper server behind a proxy, set this to true
     ; HasProxy = false
 
@@ -707,10 +707,10 @@
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the inventory operations while in other grids.
-; * Still not completely safe, especially if users perform inventory operations 
+; * Still not completely safe, especially if users perform inventory operations
 ; * while in those grids. The more the user accesses his/her inventory, the more
 ; * those simulators will know about the user's inventory.
-; * 
+; *
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
@@ -723,7 +723,7 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-    ; HGInventoryService is a public-facing inventory service that allows users to 
+    ; HGInventoryService is a public-facing inventory service that allows users to
     ; interact with their suitcase folder when on a foreign grid.  This reuses the general inventory service connector.
     ; Hence, if the user has set up authentication in [Network] to protect their private services
     ; make sure it is not set here.
@@ -736,15 +736,15 @@
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
 ; * the assets of this world.
-; * 
+; *
 [HGAssetService]
     ;; Use the second option if you have FSAsset service enabled
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFSAssetService"
-    
+
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
-    ; HGAssetService is a public-facing service that allows users to  
+    ; HGAssetService is a public-facing service that allows users to
     ; read and create assets when on another grid.  This reuses the general asset service connector.
     ; Hence, if the user has set up authentication in [Network] to protect their private services
     ; make sure it is overriden for this public service.
@@ -756,11 +756,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
@@ -818,5 +818,5 @@
     ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
     BaseDirectory = "./bakes"
 
-[MuteListService]       
+[MuteListService]
         LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
diff --git a/bin/Robust.Tests.ini b/bin/Robust.Tests.ini
index c25e39b..bf72633 100644
--- a/bin/Robust.Tests.ini
+++ b/bin/Robust.Tests.ini
@@ -3,7 +3,7 @@
 
     ; The URL of the Robust server
     BaseURL = "http://127.0.0.1"
-    
+
     ; The public port of the Robust server
     PublicPort = "8888"
 
@@ -30,14 +30,14 @@
     ; Set path to directory for plugin registry. Information
     ; about the registered repositories and installed plugins
     ; will be stored here
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     RegistryLocation = "."
 
     ; Modular configurations
     ; Set path to directory for modular ini files...
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     ConfigDirectory = "."
-    
+
         console = "rest"
 
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
@@ -49,7 +49,7 @@
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
-  
+
 [ServiceList]
     GridServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridServiceConnector"
     PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
@@ -92,7 +92,7 @@
     ;; This is useful in cases where you want to protect most of the services,
     ;; but unprotect individual services. Username and Password can also be
     ;; overriden if you want to use different credentials for the different services.
-    
+
     ;; By default, scripts are not allowed to call private services via llHttpRequest()
     ;; Such calls are detected by the X-SecondLife-Shared HTTP header
     ;; If you allow such calls you must be sure that they are restricted to very trusted scripters
@@ -181,7 +181,7 @@
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
     ;;
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
     ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
@@ -200,7 +200,7 @@
 
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. 
+; * is implemented.
 ; *
 [AuthenticationService]
     ; for the server connector
@@ -240,7 +240,7 @@
     ;AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     ;GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
     CreateDefaultAvatarEntries = true
@@ -360,7 +360,7 @@
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
     ;; Options are
-    ;;   "none"     no DST 
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -381,7 +381,7 @@
     ;;
     ;; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ;DOSForgiveClientAfterMS = 120000
-    ;; 
+    ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 5690c1d..38e6f17 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -4,20 +4,20 @@
 ; **
 ; *
 ; * The Const section allows us to define some basic information that we
-; * will use throughout our configuration. We will provide examples for 
+; * will use throughout our configuration. We will provide examples for
 ; * setting the base url of the Robust server and the public and private ports
 ; * it uses. Changing the values of the constants will set the operating
 ; * parameters thoughout the configuration. Other constants that may prove
-; * to be useful may be added to the followin section. They may be 
+; * to be useful may be added to the followin section. They may be
 ; * referenced anywhere in the configuration by using ${Const|Name}. One
 ; * such use is providing a base path for setting locations that Robust
 ; * uses to write data.
-; * 
+; *
 [Const]
 
     ; The URL of the Robust server
     BaseURL = "http://127.0.0.1"
-    
+
     ; The public port of the Robust server
     PublicPort = "8002"
 
@@ -44,14 +44,14 @@
     ; Set path to directory for plugin registry. Information
     ; about the registered repositories and installed plugins
     ; will be stored here
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     RegistryLocation = "."
 
     ; Modular configurations
     ; Set path to directory for modular ini files...
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     ConfigDirectory = "robust-include"
-    
+
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
     ConsoleHistoryFileEnabled = true
 
@@ -61,7 +61,7 @@
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
-    
+
     ; peers SSL certificate validation options
     ; you can allow selfsigned certificates or no official CA with next option set to true
     NoVerifyCertChain = true
@@ -69,7 +69,7 @@
     NoVerifyCertHostname = true
     ; having both options true does provide encryption but with low security
     ; set both true if you don't care to use SSL, they are needed to contact regions or grids that do use it.
-  
+
 [ServiceList]
     AssetServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AssetServiceConnector"
     InventoryInConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XInventoryInConnector"
@@ -140,7 +140,7 @@
     ;; This is useful in cases where you want to protect most of the services,
     ;; but unprotect individual services. Username and Password can also be
     ;; overriden if you want to use different credentials for the different services.
-    
+
     ;; By default, scripts are not allowed to call private services via llHttpRequest()
     ;; Such calls are detected by the X-SecondLife-Shared HTTP header
     ;; If you allow such calls you must be sure that they are restricted to very trusted scripters
@@ -201,29 +201,29 @@
     ;; Choose an asset service (Only one option should be enabled)
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
-    
+
     ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
     ;; These directories must be on the same physical filesystem
     ;BaseDirectory = "./fsassets/data"
     ;SpoolDirectory = "./fsassets/tmp"
-    
+
     ;; Original service can be checked if FSAssets can not find an asset
     ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
-    
+
     ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
     ;; Reduces DB calls if asset is requested often. Default value 0 will always update access time
     ;DaysBetweenAccessTimeUpdates = 30
-    
+
     ;; Should FSAssets print read/write stats to the robust console, default is true
     ;ShowConsoleStats = true
-    
+
     ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
     ;StorageProvider = ""
     ;ConnectionString = ""
     ;Realm = "fsassets"
-    
+
     ;; The following are common to both the default asset service and FSAsset service
-    
+
     ;; Common asset service options
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
@@ -275,7 +275,7 @@
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
     ;;
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
     ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
@@ -322,19 +322,19 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
 
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. 
+; * is implemented.
 ; *
 [AuthenticationService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ; Realm = "useraccounts"
+    ; Realm = "auth"
 
     ;; Allow the service to process HTTP getauthinfo calls.
     ;; Default is false.
@@ -363,7 +363,7 @@
 [UserAccountService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; Realm = "useraccounts"
+    ; Realm = "UserAccounts"
 
     ; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -373,7 +373,7 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
     CreateDefaultAvatarEntries = true
@@ -468,7 +468,7 @@
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
     ;; Options are
-    ;;   "none"     no DST 
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -489,7 +489,7 @@
     ;;
     ;; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ;DOSForgiveClientAfterMS = 120000
-    ;; 
+    ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 
@@ -572,5 +572,5 @@
     ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
     BaseDirectory = "./bakes"
 
-[MuteListService]       
+[MuteListService]
         LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 7330f6f..ab8f25d 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -47,7 +47,7 @@
     ; Because LocalGridServicesConnector starts this service, in grid mode we need to suppress
     ; the inappropriate console commands that it registers.
     SuppressConsoleCommands = true
-    
+
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
     LibraryName = "OpenSim Library"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index aee3d5f..e93ce3c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -105,7 +105,7 @@
 
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
@@ -122,7 +122,7 @@
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
 
@@ -171,7 +171,7 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -187,7 +187,7 @@
 
     ;; Warning: advanced and unusual. Default is false.
     ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; while separating regions' assets from users' assets. Asset transfer between
     ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
@@ -196,7 +196,7 @@
 [HGAssetService]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -204,11 +204,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 018c65e..24f9813 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 ;;
-;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is
 ;; installed at http://www.mygrid.com/Grid/
 ;;
 ; AssetServerURI = "http://www.mygrid.com/Grid/?id="
@@ -28,17 +28,17 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     AvatarServices = "SimianAvatarServiceConnector"
-    
+
     NeighbourServices = "NeighbourServicesOutConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "HGEntityTransferModule"
     InventoryAccessModule = "HGInventoryAccessModule"
-    
+
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = false
-    
+
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
@@ -87,7 +87,7 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your profile server 
+    ; Change this to your profile server
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index b3db08a..fdf7ca2 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 ;;
-;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is
 ;; installed at http://www.mygrid.com/Grid/
 ;;
 ; AssetServerURI = "http://www.mygrid.com/Grid/?id="
@@ -28,17 +28,17 @@
     AssetServices = "SimianAssetServiceConnector"
     InventoryServices = "SimianInventoryServiceConnector"
     AvatarServices = "SimianAvatarServiceConnector"
-    
+
     NeighbourServices = "NeighbourServicesOutConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "BasicEntityTransferModule"
     InventoryAccessModule = "BasicInventoryAccessModule"
-    
+
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = false
-    
+
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 4e683e2..127b073 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -104,8 +104,8 @@
     ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
-    ;; Options are 
-    ;;   "none"     no DST 
+    ;; Options are
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -114,9 +114,9 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
-[MuteListService]       
+[MuteListService]
         LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
-        
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d0b152c..8931557 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,20 +85,20 @@
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
-    ;;  
+    ;;
     ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
     ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
     ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
     ;;                  an explicit region.
-    ;;  
+    ;;
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
-    ;;  
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
-    ;;  
+    ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
-    ;;  
+    ;;
     ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
     ;;
     ;; For example:
@@ -121,7 +121,7 @@
     ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"    
+    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -163,7 +163,7 @@
     ; ;
     ; ; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ; DOSForgiveClientAfterMS = 120000
-    ; ; 
+    ; ;
     ; ; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 [FreeswitchService]
@@ -197,7 +197,7 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
@@ -341,11 +341,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 4f3994f..e305972 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -27,8 +27,8 @@
     FriendsModule           = "HGFriendsModule"
     UserManagementModule    = "HGUserManagementModule"
     SearchModule            = "BasicSearchModule"
-        MuteListService                 = "LocalMuteListServicesConnector"      
-    
+        MuteListService                 = "LocalMuteListServicesConnector"
+
     InventoryServiceInConnector       = true
     AssetServiceInConnector           = true
     HypergridServiceInConnector       = true
@@ -80,7 +80,7 @@
 
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-  
+
     HypergridLinker = true
     AllowHypergridMapSearch = true
 
@@ -124,7 +124,7 @@
     GridService           = "OpenSim.Services.GridService.dll:GridService"
     AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
-   
+
     ; This inventory service will be used to initialize the user's inventory
     HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
     HGInventoryServiceConstructorArg = "HGInventoryService"
@@ -191,9 +191,9 @@
     UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
     InGatekeeper = True
 
-[MuteListService]       
+[MuteListService]
         LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
-        
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 7535b47..1da5e9d 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -1,6 +1,6 @@
 ; Enable OSSL functions.
 ; Including this file in a region's set of INI files, causes the OpenSimulator
-;   specific functions to be enabled. 
+;   specific functions to be enabled.
 ; See http://opensimulator.org/wiki/OSSL for a description of OSSL functions and
 ;   refer to http://opensimulator.org/wiki/OSSL_Implemented for a list of functions.
 
@@ -45,9 +45,9 @@
   ;           "PARCEL_OWNER" -- enable for parcel owner
   ;           "PARCEL_GROUP_MEMBER" -- enable for any member of the parcel group
   ;           uuid -- enable for specified ID (may be avatar or group ID)
-  ;    from this we can also create macros that can be include in the list as 
+  ;    from this we can also create macros that can be include in the list as
   ;    ${OSSL|macroname} see examples below
-  
+
   ; parcel macros
   ; Allowing ossl functions for anyone owning a parcel can be dangerous especially if
   ;    a region is selling or otherwise giving away parcel ownership. By default, parcel
@@ -68,10 +68,10 @@
   ;   the owners of the containing prim. There can also be entries beginning with
   ;   'Creators_". The 'Creators_" parameters can only be a list of UUIDs and it is
   ;   checked against the creator of the script itself.
-  
+
 ; *************************************************
- 
-  ; ThreatLevel  None 
+
+  ; ThreatLevel  None
   Allow_osGetAgents =               ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetAvatarList =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetGender =               true
@@ -85,11 +85,11 @@
   Allow_osSetSunParam =             ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTeleportOwner =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osWindActiveModelPluginName = true
-  
+
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  VeryLow
   Allow_osEjectFromGroup =          ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osForceBreakAllLinks =      ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@@ -110,7 +110,7 @@
   Allow_osSetWindParam =            ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTerrainFlush =            ESTATE_MANAGER,ESTATE_OWNER
   Allow_osUnixTimeToTimestamp =     true
-  
+
   ; ThreatLevel  Low
   Allow_osAvatarName2Key =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osFormatString =            true
@@ -125,7 +125,7 @@
   Allow_osNpcSetProfileAbout =      ${OSSL|osslNPC}
   Allow_osNpcSetProfileImage =      ${OSSL|osslNPC}
   Allow_osDie =                     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Moderate
   Allow_osDropAttachment =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osDropAttachmentAt =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
@@ -141,7 +141,7 @@
   Allow_osGetSimulatorMemoryKB =    ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageAttachments =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetSpeed =                ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel High
   Allow_osCauseDamage =             ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osCauseHealing =            ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
@@ -190,7 +190,7 @@
   Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTexture =       ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTextureHeight = ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  VeryHigh
   Allow_osAgentSaveAppearance =     ESTATE_MANAGER,ESTATE_OWNER
   ; Warning: The next function allows scripts to force animations on avatars without the user giving permission.
@@ -209,7 +209,7 @@
   Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRot  =                 false
   Allow_osSetParcelDetails =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Severe
   Allow_osConsoleCommand =          false
   Allow_osGrantScriptPermissions =  false
@@ -217,10 +217,10 @@
   Allow_osRevokeScriptPermissions = false
   Allow_osTeleportAgent =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTeleportObject =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Severe with additional internal restrictions
   Allow_osGetAgentIP =              true   ; always restricted to Administrators (true or false to disable)
-  
+
 ; available functions out of Threat level control (for reference only)
 ;  Allow_osCheckODE =                true
 ;  Allow_osClearInertia =            true
@@ -231,7 +231,7 @@
 ;  Allow_osDrawFilledRectangle =     true
 ;  Allow_osDrawImage =               true
 ;  Allow_osDrawLine =                true
-;  Allow_osDrawPolygon =             true 
+;  Allow_osDrawPolygon =             true
 ;  Allow_osDrawRectangle =           true
 ;  Allow_osDrawResetTransform =      true
 ;  Allow_osDrawRotationTransform =   true
diff --git a/bin/pCampBot.ini.example b/bin/pCampBot.ini.example
index 2952bb0..138e4ec 100644
--- a/bin/pCampBot.ini.example
+++ b/bin/pCampBot.ini.example
@@ -7,13 +7,13 @@
 
 [Bot]
   ; Control whether bots should regularly send agent updates
-  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly
   ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets.
   ; Defaults to true.
   SendAgentUpdates = true
 
   ; Control whether bots will requests textures when receiving object information
-  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly
   ; reduce the realism compared to viewers which requests such texture data if not already cached.
   ; Defaults to true.
   RequestObjectTextures = true