diff --git a/bin/OpenSim.ini.example.preview b/bin/OpenSim.ini.example.preview
deleted file mode 100644
index 51e737eb1c..0000000000
--- a/bin/OpenSim.ini.example.preview
+++ /dev/null
@@ -1,356 +0,0 @@
-[Startup]
-    ; Set this to true if you want to log crashes to disk
-    ; this can be useful when submitting bug reports.
-    save_crashes = false
-
-    ; Directory to save crashes to if above is enabled
-    ; (eg default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
-    crash_dir = "crashes"
-
-    ; Http proxy support for llHTTPRequest and dynamic texture loading
-    ; Set HttpProxy to the URL for your proxy server if you would like
-    ; to proxy llHTTPRequests through a firewall
-    ; HttpProxy = "http://proxy.com"
-    ; Set HttpProxyExceptions to a list of regular expressions for 
-    ; URLs that you don't want going through the proxy such as servers
-    ; inside your firewall, separate patterns with a ';'
-    ; HttpProxyExceptions = ".mydomain.com;localhost"
-
-    ; Set this to true if you are connecting your OpenSimulator regions to a grid
-    ; Set this to false if you are running OpenSimulator in standalone mode
-    gridmode = false
-
-    startup_console_commands_file = "startup_commands.txt"
-    shutdown_console_commands_file = "shutdown_commands.txt"
-
-    ; To run a script every few minutes, set the script filename here
-    ; timer_Script = "filename"
-
-    ; ##
-    ; ## CLIENTS
-    ; ##
-
-    ; Enables EventQueueGet Service.
-    EventQueue = true
-
-    ; Set this to the DLL containig the client stack to use.
-    clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
-
-    ; ##
-    ; ## REGIONS
-    ; ##
-
-    ; Determine where OpenSimulator looks for the files which tell it which regions to server
-    ; Defaults to "filesystem" if this setting isn't present
-    region_info_source = "filesystem"
-    ; region_info_source = "web"
-
-    ; Determines where the region XML files are stored if you are loading these from the filesystem.
-    ; Defaults to bin/Regions in your OpenSimulator installation directory
-    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
-
-    ; 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";
-
-    ; Draw objects on maptile.   This step might take a long time if you've got a huge amount of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = false
-
-    ; Maximum total size, and maximum size where a prim can be physical
-    NonPhysicalPrimMax = 256
-    PhysicalPrimMax = 10
-    ClampPrimSize = false
-
-    ; Region crossing
-    AllowScriptCrossing = false
-    ; If you set this to "true", any region that can teleport to you can
-    ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
-    ; YOU HAVE BEEN WARNED!!!
-    TrustBinaries = false
-
-    ; ##
-    ; ## STORAGE
-    ; ##
-
-    ; *** Prim Storage - only leave one storage_plugin uncommented ***
-    ; --- Null stores nothing - effectively disabling persistence:
-    ;storage_plugin = "OpenSim.Data.Null.dll"
-
-    ; --- To use sqlite as region storage:
-    storage_plugin = "OpenSim.Data.SQLite.dll"
-    storage_connection_string="URI=file:OpenSim.db,version=3";
-
-    ; --- To use MySQL storage, supply your own connectionstring (this is only an example):
-    ;     note that the supplied account needs create privilegies if you want it to auto-create needed tables.
-    ; storage_plugin="OpenSim.Data.MySQL.dll"
-    ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
-    ; If you want to use a different database/server for estate data, then
-    ; uncomment and change this connect string. Defaults to the above if not set
-    ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
-
-    ; Select whether you want to use local or grid asset storage.
-    ;
-    ; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should
-    ; really be eliminated).  The database itself is defined in asset_plugin below
-    ;
-    ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
-    ; grid asset server.  If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
-    ; locally.  This will mean you won't be able to take items using your assets to other people's regions.
-    
-    ; asset_database can be default, local or grid.  This controls where assets (textures, scripts, etc.) are stored for your region
-    ; 
-    ; If set to default, then
-    ;   In standalone mode the local database based asset service will be used
-    ;   In grid mode the grid asset service will be used for asset storage
-    ;   This is probably the setting that you want.
-    ;
-    ; If set to local then the local database based asset service will be used in standalone and grid modes
-    ; If set to grid then the grid based asset service will be used in standalone and grid modes
-    ; All other values will cause a search for a matching assembly that contains an asset server client.
-    ; See also: AssetCache
-    asset_database = "default"   
-
-    ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
-    ; prevent frequently changing objects from heavily loading the region data store.
-    ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
-    ; 
-    ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
-    MinimumTimeBeforePersistenceConsidered = 60
-    ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
-    MaximumTimeBeforePersistenceConsidered = 600
-
-    ; Should avatars in neighbor sims see objects in this sim?
-    see_into_this_sim_from_neighbor = True
-
-    ; ##
-    ; ## PHYSICS
-    ; ##
-
-    ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
-    physical_prim = true
-
-    ; Select a mesher here. ZeroMesher is save and fast.
-    ; ZeroMesher also means that the physics engine models the physics of prims
-    ; sticking to the basic shapes the engine does support. Usually this is only a box.
-    ; Meshmerizer gives a better handling of complex prims by using triangle meshes.
-    ; Note, that only ODE physics currently deals with meshed prims in a satisfactoring way
-    ;
-    meshing = ZeroMesher
-    ;meshing = Meshmerizer
-
-    ; Choose one of the physics engines below
-    physics = basicphysics
-    ;physics = POS
-    ;physics = OpenDynamicsEngine
-    ;physics = modified_BulletX
-
-    ; ##
-    ; ## PERMISSIONS
-    ; ##
-
-    ;permissionmodules = "DefaultPermissionsModule"
-
-    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
-    ; any item, etc.  This may not yet be implemented uniformally.
-    ; If set to true, then all permissions checks are carried out
-    ; Default is false
-    serverside_object_permissions = false
-
-    allow_grid_gods = false
-
-    ; This allows somne control over permissions
-    ; please note that this still doesn't duplicate SL, and is not intended to
-    ;region_owner_is_god = true
-    ;parcel_owner_is_god = true
-
-    ; Control user types that are allowed to create new scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;   
-    ; Current possible values are 
-    ;     all - anyone can create scripts (subject to normal permissions)
-    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
-    ; Default value is all 
-    ; allowed_script_creators = all
-
-    ; Control user types that are allowed to edit (save) scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;   
-    ; Current possible values are 
-    ;     all - anyone can edit scripts (subject to normal permissions)
-    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
-    ; Default value is all 
-    ; allowed_script_editors = all
-
-    ; ##
-    ; ## SCRIPT ENGINE
-    ; ##
-
-    ;DefaultScriptEngine = "ScriptEngine.DotNetEngine"
-    DefaultScriptEngine = "XEngine"
-
-    ; ##
-    ; ## WORLD MAP
-    ; ##
-
-    ;WorldMapModule = "WorldMap"
-    ;MapImageModule = "MapImageModule"
-	
-    ; ##
-    ; ## Customized Cache Implementation
-    ; ##
-    ;
-    ; The AssetCache value allows the name of an alternative caching
-    ; implementation to be specified. This can normally be omitted.
-    ; This value corresponds to the provider value associated with the
-    ; intended cache implementation plugin.
-    ; See also: asset_database
-
-    ; AssetCache = "OpenSim.Framework.Communications.Cache.AssetCache"
-
-    ; ##
-    ; ## EMAIL MODULE
-    ; ##
-
-    ;emailmodule = DefaultEmailModule
-
-[SMTP]
-
-    enabled=false
-
-    ;enabled=true
-    ;internal_object_host=lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
-    ;SMTP_SERVER_PORT=25
-    ;SMTP_SERVER_LOGIN=foo
-    ;SMTP_SERVER_PASSWORD=bar
-
-[Communications]
-
-;InterregionComms = "LocalComms"
-InterregionComms = "RESTComms"
-
-[StandAlone]
-    accounts_authenticate = true
-    welcome_message = "Welcome to OpenSimulator"
-
-    ; Asset database provider
-    asset_plugin = "OpenSim.Data.SQLite.dll"
-    ; asset_plugin = "OpenSim.Data.MySQL.dll" ; for mysql
-    ; asset_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
-
-    ; the Asset DB source.  This only works for sqlite, mysql, and nhibernate for now
-    ; Asset source SQLite example
-    asset_source = "URI=file:Asset.db,version=3"
-    ; Asset Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
-    ; asset_source = "SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"
-    ; Asset Source MySQL example
-    ;asset_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
-
-    ; Inventory database provider
-    inventory_plugin = "OpenSim.Data.SQLite.dll"
-    ; inventory_plugin = "OpenSim.Data.MySQL.dll"
-    ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
-
-    ; Inventory source SQLite example
-    inventory_source = "URI=file:inventoryStore.db,version=3"
-    ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
-    ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
-    ; Inventory Source MySQL example
-    ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
-
-    ; User Data Database provider
-    ;
-    ; Multiple providers can be specified by separating them with commas (whitespace is unimportant)
-    ; If multiple providers are specified then if a profile is requested, each is queried until one
-    ; provides a valid profile, or until all providers have been queried.
-    ; Unfortunately the order of querying is currently undefined (it may not be the order in which
-    ; providers are specified here).  This needs to be fixed
-    ;
-    userDatabase_plugin = "OpenSim.Data.SQLite.dll"
-    ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
-    ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
-
-    ; User source SQLite example
-    user_source = "URI=file:userprofiles.db,version=3"
-    ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
-    ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
-    ; User Source MySQL example
-    ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
-
-    ; Specifies the location and filename of the default inventory library control file.  The path can be relative or absolute
-    ; Default is ./inventory/Libraries.xml
-    LibrariesXMLFile="./inventory/Libraries.xml"
-    
-    ; Specifies the location and filename of the inventory library assets control file.  The path can be relative or absolute
-    ; Setting is optional. Default is ./assets/AssetSets.xml
-    AssetSetsXMLFile="./assets/AssetSets.xml"
-
-    dump_assets_to_file = false
-
-
-[ClientStack.LindenUDP]
-    ; This is the multiplier applied to all client throttles for outgoing UDP network data
-    ; If it is set to 1, then we obey the throttle settings as given to us by the client.  If it is set to 3, for example, then we 
-    ; multiply that setting by 3 (e.g. if the client gives us a setting of 250 kilobits per second then we
-    ; will actually push down data at a maximum rate of 750 kilobits per second).
-    ; 
-    ; In principle, setting a multiplier greater than 1 will allow data to be pushed down to a client much faster
-    ; than its UI allows the setting to go.  This may be okay in some situations, such as standalone OpenSim
-    ; applications on a LAN.  However, the greater the multipler, the higher the risk of packet drop, resulting
-    ; in symptoms such as missing terrain or objects.  A much better solution is to change the client UI to allow
-    ; higher network bandwidth settings directly, though this isn't always possible.
-    ;
-    ; Currently this setting is 2 by default because we currently send much more texture data than is strictly
-    ; necessary.  A setting of 1 could result in slow texture transfer.  This will be fixed when the transfer
-    ; of textures at different levels of quality is improved.
-    ; 
-    ; Pre r7113, this setting was not exposed but was effectively 8.  You may want to try this if you encounter
-    ; unexpected difficulties
-    client_throttle_multiplier = 2;   
-
-
-
-
-
-
-
-[DataSnapshot]
-    ; The following set of configs pertains to search.
-    ; Set index_sims to true to enable search engines to index your searchable data
-    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
-    ; default is false
-    index_sims = false
-
-    ; The variable data_exposure controls what the regions expose:
-    ;    minimum: exposes only things explicitly marked for search
-    ;    all: exposes everything
-    data_exposure = minimum
-
-    ; If search is on, change this to your grid name; will be ignored for standalones
-    gridname = "OSGrid"
-
-    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
-    ; Later, you may want to increase this to 3600 (1 hour) or more
-    default_snapshot_period = 1200
-
-    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
-
-    ; This semicolon-separated string serves to notify specific data services about the existence 
-    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
-    ;data_services="http://metaverseink.com/cgi-bin/register.py"
-
-
-[OpenGridProtocol]
-    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
-    ;On/true or Off/false
-    ogp_enabled=false
-
-    ;Name Prefix/suffix when using OGP
-    ogp_firstname_prefix=""
-    ogp_lastname_suffix="_EXTERNAL"
diff --git a/bin/config.preview.donotuseyet/opensim.ini.example b/bin/config.preview.donotuseyet-v2/OpenSim.ini.example
similarity index 97%
rename from bin/config.preview.donotuseyet/opensim.ini.example
rename to bin/config.preview.donotuseyet-v2/OpenSim.ini.example
index 0e4307d8ee..77ece07e33 100644
--- a/bin/config.preview.donotuseyet/opensim.ini.example
+++ b/bin/config.preview.donotuseyet-v2/OpenSim.ini.example
@@ -1,10 +1,9 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
+; This is an example OpenSim.ini file.  You will need to copy or rename this from
+; OpenSim.ini.example to OpenSim.ini before OpenSimulator will start up.
 ;
+; If this file is not changed then OpenSimulator will start up in standalone mode using the file based
+; SQLite database to store its data.
+
 
 [Startup]
     ; Set this to true if you want to log crashes to disk
diff --git a/bin/config.preview.donotuseyet/README-IMPORTANT.TXT b/bin/config.preview.donotuseyet-v2/README-IMPORTANT.TXT
similarity index 100%
rename from bin/config.preview.donotuseyet/README-IMPORTANT.TXT
rename to bin/config.preview.donotuseyet-v2/README-IMPORTANT.TXT
diff --git a/bin/config.preview.donotuseyet-v2/defaults/README.txt b/bin/config.preview.donotuseyet-v2/defaults/README.txt
new file mode 100644
index 0000000000..5cd1b09690
--- /dev/null
+++ b/bin/config.preview.donotuseyet-v2/defaults/README.txt
@@ -0,0 +1,15 @@
+README
+
+This directory constains files which show the built-in defaults for settings within OpenSimulator.  Changing these
+files directly will have no effect.
+
+If you want to change any of these defaults, please either 
+
+(a) Copy the *.ini.default file into config/override/*.ini.  
+For instance, if you wanted to change the [Chat] settings in region.ini.defaults you would copy 
+region.ini.defaults into config/override/region.ini
+
+or
+
+(b) Copy and paste the .ini.defaults section directly into config/OpenSim.ini.  For instance, 
+if you want to change a [Chat] setting then copy the text in region.ini.defaults into config/OpenSim.ini
diff --git a/bin/config.preview.donotuseyet/region/user/concierge.ini.example b/bin/config.preview.donotuseyet-v2/defaults/applications.ini.defaults
similarity index 73%
rename from bin/config.preview.donotuseyet/region/user/concierge.ini.example
rename to bin/config.preview.donotuseyet-v2/defaults/applications.ini.defaults
index 0f6f051f87..eac488c7e7 100644
--- a/bin/config.preview.donotuseyet/region/user/concierge.ini.example
+++ b/bin/config.preview.donotuseyet-v2/defaults/applications.ini.defaults
@@ -1,10 +1,4 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
+; Settings for applications that are bundled with the core OpenSimulator package
 
 [Concierge]
     ; Enable concierge module
@@ -35,3 +29,19 @@
     ; {0} is replaced with the region's name
     ; {1} is replaced with the region's UUID
     broker = "http://broker.place.com/{1}"
+
+
+;[CMS]
+    ;enabled = true
+    ;channel = 345
+
+
+[SVN]
+    Enabled = false
+    Directory = SVNmodule\repo
+    URL = "svn://your.repo.here/"
+    Username = "user"
+    Password = "password"
+    ImportOnStartup = false
+    Autosave = false
+    AutoSavePeriod = 15 ; Number of minutes between autosave backups
diff --git a/bin/config.preview.donotuseyet-v2/defaults/external.ini.defaults b/bin/config.preview.donotuseyet-v2/defaults/external.ini.defaults
new file mode 100644
index 0000000000..e83078a657
--- /dev/null
+++ b/bin/config.preview.donotuseyet-v2/defaults/external.ini.defaults
@@ -0,0 +1,183 @@
+; Settings that control the exposure of data externally.
+
+
+[DataSnapshot]
+    ; The following set of configs pertains to search.
+    ; Set index_sims to true to enable search engines to index your searchable data
+    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
+    ; default is false
+    index_sims = false
+
+    ; The variable data_exposure controls what the regions expose:
+    ;    minimum: exposes only things explicitly marked for search
+    ;    all: exposes everything
+    data_exposure = minimum
+
+    ; If search is on, change this to your grid name; will be ignored for standalones
+    gridname = "OSGrid"
+
+    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
+    ; Later, you may want to increase this to 3600 (1 hour) or more
+    default_snapshot_period = 1200
+
+    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
+    snapshot_cache_directory = "DataSnapshot"
+
+    ; This semicolon-separated string serves to notify specific data services about the existence 
+    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
+    ;data_services="http://metaverseink.com/cgi-bin/register.py"
+
+
+[GridInfo]
+    ; These settings are used to return information on a get_grid_info call.
+    ; Client launcher scripts and third-party clients make use of this to
+    ; autoconfigure the client and to provide a nice user experience. If you
+    ; want to facilitate that, you should configure the settings here according
+    ; to your grid or standalone setup.
+    ;
+    ; See http://opensimulator.org/wiki/GridInfo
+
+    ; login uri: for grid this is the user server URI
+    login = http://127.0.0.1:9000/
+
+    ; long grid name: the long name of your grid
+    gridname = "the lost continent of hippo"
+
+    ; short grid name: the short name of your grid
+    gridnick = "hippogrid"
+
+    ; login page: optional: if it exists it will be used to tell the client to use
+    ;                       this as splash page
+    ; currently unused
+    ;welcome = http://127.0.0.1/welcome
+
+    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ;                       this for all economy related things
+    ; currently unused
+    ;economy = http://127.0.0.1:9000/
+
+    ; web page of grid: optional: page providing further information about your grid
+    ; currently unused
+    ;about = http://127.0.0.1/about/
+
+    ; account creation: optional: page providing further information about obtaining
+    ;                             a user account on your grid
+    ; currently unused
+    ;register = http://127.0.0.1/register
+
+    ; help: optional: page providing further assistance for users of your grid
+    ; currently unused
+    ;help = http://127.0.0.1/help
+
+    ; password help: optional: page providing password assistance for users of your grid
+    ; currently unused
+    ;password = http://127.0.0.1/password
+
+
+; Uncomment the following for IRC bridge
+; experimental, so if it breaks... keep both parts... yada yada
+; also, not good error detection when it fails
+;[IRC]
+    ;enabled = true ; you need to set this otherwise it won't connect
+    ;server  = name.of.irc.server.on.the.net
+    ;; user password - only use this if the server requires one
+    ;password = mypass
+    ;nick    = OpenSimBotNameProbablyMakeThisShorter
+    ;channel = #the_irc_channel_you_want_to_connect_to
+    ;port = 6667
+    ;; channel to listen for configuration commands
+    ;commands_enabled = false
+    ;command_channel = 2777
+    ;report_clients = true
+    ;; relay private chat connections
+    ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
+    ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
+    ;; relay_private_channel_in -- channel to receive message from the IRC bridge
+    ;; relay_chat = false: IRC bridge will not relay normal chat
+    ;; access_password -- simple security device
+    ;;
+    ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
+    ;;
+    ;;     relay_private_channels = false
+    ;;     relay_chat = true
+    ;;
+    ;; to relay chat only to/from private in-world channels:
+    ;;
+    ;;     relay_chat = false
+    ;;     relay_private_channels = true
+    ;;     relay_private_channel_in = 2226
+    ;;     relay_private_channel_out = 2225
+    ;;
+    ;; in this example, all chat coming in from IRC will be send out via
+    ;; in-world channel 2226, and all chat from in-world channel 2225 will
+    ;; be relayed to the IRC channel.
+    ;;
+    ;relay_private_channels = false
+    ;relay_private_channel_in = 2226
+    ;relay_private_channel_out = 2225
+    ;relay_chat = true
+    ;access_password = foobar
+
+    ;fallback_region = name of "default" region
+    ;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
+    ; must start with "PRIVMSG {0} : " or irc server will get upset
+    ;for <bot>:<user in region> :<message>
+    ;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
+    ;for <bot>:<message> - <user of region> :
+    msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
+    ;for <bot>:<message> - from <user> :
+    ;msgformat = "PRIVMSG {0} : {3} - from {1}"
+
+
+[RemoteAdmin]
+    enabled = false
+    access_password = unknown
+
+    ; the create_region XmlRpc call uses region_file_template to generate
+    ; the file name of newly create regions (if they are created
+    ; persistent). the parameter available are:
+    ;     {0} - X location
+    ;     {1} - Y location
+    ;     {2} - region UUID
+    ;     {3} - region port
+    ;     {4} - region name with " ", ":", "/" mapped to  "_"
+
+    region_file_template = "{0}x{1}-{2}.xml"
+
+    ; we can limit the number of regions that XmlRpcCreateRegion will
+    ; allow by setting this to a positive, non-0 number: as long as the
+    ; number of regions is below region_limits, XmlRpcCreateRegion will
+    ; succeed. setting region_limit to 0 disables the check.
+    ; default is 0
+    ;region_limit = 0
+
+    ; enable only those methods you deem to be appropriate using a | delimited whitelist
+    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml    
+    ; if this parameter is not specified but enabled = true, all methods will be available
+    enabled_methods = all
+
+
+[RestPlugins]
+    ; Change this to true to enable REST Plugins. This must be true if you wish to use
+    ; REST Region or REST Asset and Inventory Plugins
+    enabled = false
+    god_key = SECRET
+    prefix = /admin
+
+
+[RestRegionPlugin]
+    ; Change this to true to enable the REST Region Plugin
+    enabled = false
+
+
+[RestHandler]
+  ; Change this to true to enable the REST Asset and Inventory Plugin
+  enabled = false
+  authenticate=true
+  secured=true
+  extended-escape=true
+  realm=OpenSim REST
+  dump-asset=false
+  path-fill=true
+  dump-line-size=32
+  flush-on-error=true
diff --git a/bin/config.preview.donotuseyet-v2/defaults/misc.ini.defaults b/bin/config.preview.donotuseyet-v2/defaults/misc.ini.defaults
new file mode 100644
index 0000000000..6a18940faa
--- /dev/null
+++ b/bin/config.preview.donotuseyet-v2/defaults/misc.ini.defaults
@@ -0,0 +1,3 @@
+; Miscellaneous settings
+
+; There are none at this time
diff --git a/bin/config.preview.donotuseyet/region/physics/engines/ode.ini.example b/bin/config.preview.donotuseyet-v2/defaults/physics.ini.defaults
similarity index 94%
rename from bin/config.preview.donotuseyet/region/physics/engines/ode.ini.example
rename to bin/config.preview.donotuseyet-v2/defaults/physics.ini.defaults
index ec9380a951..3822aca74d 100644
--- a/bin/config.preview.donotuseyet/region/physics/engines/ode.ini.example
+++ b/bin/config.preview.donotuseyet-v2/defaults/physics.ini.defaults
@@ -1,10 +1,4 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
+; Physics settings
 
 [ODEPhysicsSettings]
     ;##
diff --git a/bin/config.preview.donotuseyet/protocols/client/lindenlab.ini.example b/bin/config.preview.donotuseyet-v2/defaults/protocols.ini.defaults
similarity index 81%
rename from bin/config.preview.donotuseyet/protocols/client/lindenlab.ini.example
rename to bin/config.preview.donotuseyet-v2/defaults/protocols.ini.defaults
index 965e1c702d..e795a107fb 100644
--- a/bin/config.preview.donotuseyet/protocols/client/lindenlab.ini.example
+++ b/bin/config.preview.donotuseyet-v2/defaults/protocols.ini.defaults
@@ -1,10 +1,4 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
+; Communication protocols settings
 
 [ClientStack.LindenUDP]
     ; This is the multiplier applied to all client throttles for outgoing UDP network data
@@ -25,3 +19,27 @@
     ; Pre r7113, this setting was not exposed but was effectively 8.  You may want to try this if you encounter
     ; unexpected difficulties
     client_throttle_multiplier = 2;
+
+
+[Communications]
+
+;InterregionComms = "LocalComms"
+InterregionComms = "RESTComms"
+
+
+; This file shows initialization defaults for OpenSimulator.  If you want to override these
+; please copy/rename this file from .ini.example file to .ini.  For example
+;
+; chat.ini.example => chat.ini
+;
+; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
+;
+
+[OpenGridProtocol]
+    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
+    ;On/true or Off/false
+    ogp_enabled=false
+
+    ;Name Prefix/suffix when using OGP
+    ogp_firstname_prefix=""
+    ogp_lastname_suffix="_EXTERNAL"
diff --git a/bin/config.preview.donotuseyet-v2/defaults/region.ini.defaults b/bin/config.preview.donotuseyet-v2/defaults/region.ini.defaults
new file mode 100644
index 0000000000..9d61b1eec4
--- /dev/null
+++ b/bin/config.preview.donotuseyet-v2/defaults/region.ini.defaults
@@ -0,0 +1,130 @@
+; Region settings
+
+
+[Chat]
+    ; Controls whether the chat module is enabled.  Default is true.
+    enabled = true;
+
+    ; Distance in meters that whispers should travel.  Default is 10m
+    whisper_distance = 10
+
+    ; Distance in meters that ordinary chat should travel.  Default is 30m
+    say_distance = 30
+
+    ; Distance in meters that shouts should travel.  Default is 100m
+    shout_distance = 100
+
+
+[Economy]
+    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
+    ; In grid mode, use this currency XMLRPC server.  Leave blank for normal functionality
+    CurrencyServer = ""
+    ; "http://192.168.1.127/currency.php"
+
+    ; In grid mode, this is the land XMLRPC server. Leave blank for normal functionality
+    LandServer = ""
+    ;"http://192.168.1.127/landtool.php"
+
+    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
+    ObjectCapacity = 45000
+
+    ; Money Unit fee to upload textures, animations etc
+    PriceUpload = 0
+
+    ; Money Unit fee to create groups
+    PriceGroupCreate = 0
+
+    ; This is the account Money goes to for fees.  Remember, economy requires that money circulates somewhere... even if it's an upload fee
+    EconomyBaseAccount = 00000000-0000-0000-0000-000000000000
+
+    ; This is the type of user that will pay fees.
+    ; Set this to 2 for users, estate managers and Estate Owners
+    ; Set this to 1 for Users and Estate Managers
+    ; Set this to 0 for Users only.
+    ; -1 disables
+    UserLevelPaysFees = -1
+
+    ; Amount to give to user as a stipend
+    UserStipend = 1000
+
+    ; When a user gets low on money units and logs off, then logs back on, issue a new stipend if they have less money units then this
+    ; amount. Be aware that the account money isn't stored anywhere so users will get a stipend if you restart the simulator
+    IssueStipendWhenClientIsBelowAmount = 10
+
+    ; If this is true, the simulator will remember account balances until the simulator is shutdown or restarted.
+    KeepMoneyAcrossLogins = true
+
+    ; We don't really know what the rest of these values do.  These get sent to the client
+    ; These taken from Agni at a Public Telehub.  Change at your own risk.
+    ObjectCount = 0
+    PriceEnergyUnit = 100
+    PriceObjectClaim = 10
+    PricePublicObjectDecay = 4
+    PricePublicObjectDelete = 4
+    PriceParcelClaim = 1
+    PriceParcelClaimFactor = 1
+
+    PriceRentLight = 5
+    TeleportMinPrice = 2
+    TeleportPriceExponent = 2
+    EnergyEfficiency = 1
+    PriceObjectRent = 1
+    PriceObjectScaleFactor = 10
+    PriceParcelRent = 1
+
+
+[Messaging]
+    ; Control which region module is used for instant messaging.
+    ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
+    InstantMessageModule = InstantMessageModule
+
+
+; Uncomment the following to control the progression of daytime
+; in the Sim.  The defaults are what is shown below
+;[Sun]
+    ; number of wall clock hours for an opensim day.  24.0 would mean realtime
+    ;day_length = 4
+    ; Year length in days
+    ;year_length = 60
+    ; Day to Night Ratio
+    ;day_night_offset = 0.45
+    ; send a Sun update every update_interval # of frames.  A lower number will
+    ; make for smoother sun transition at the cost of network
+    ;update_interval = 100
+
+
+[Trees]
+    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
+    ; default is false
+    active_trees = false
+
+    ; Density of tree population
+    tree_density = 1000.0
+
+
+[Voice]
+    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
+    enabled = false
+    ; This is not supported by the SLViewer right now and
+    ; hardcoded within the SL Viewer. Maybe it will be
+    ; changed in future. :-)
+    account_management_server = https://www.bhr.vivox.com/api2
+    ; Global SIP Server for conference calls
+    sip_domain = testserver.com
+
+
+[AsteriskVoice]
+    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
+    enabled = false
+    ; SIP account server domain
+    sip_domain = testserver.com
+    ; SIP conf server domain
+    conf_domain = testserver.com
+    ; URL of the asterisk opensim frontend
+    asterisk_frontend = http://testserver.com:49153/
+    ; password for the asterisk frontend XmlRpc calls
+    asterisk_password = bah-humbug
+    ; timeout for XmlRpc calls to asterisk front end (in ms)
+    asterisk_timeout = 3000
+    ; salt for asterisk nonces
+    asterisk_salt = paluempalum
diff --git a/bin/config.preview.donotuseyet/region/scripting/engines/dotnetengine.ini.example b/bin/config.preview.donotuseyet-v2/defaults/scriptengines.ini.defaults
similarity index 67%
rename from bin/config.preview.donotuseyet/region/scripting/engines/dotnetengine.ini.example
rename to bin/config.preview.donotuseyet-v2/defaults/scriptengines.ini.defaults
index ee624def42..c6155816eb 100644
--- a/bin/config.preview.donotuseyet/region/scripting/engines/dotnetengine.ini.example
+++ b/bin/config.preview.donotuseyet-v2/defaults/scriptengines.ini.defaults
@@ -1,10 +1,87 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
+; Script engine settings
+
+
+[XEngine]
+    ; Enable this engine in this OpenSim instance
+    Enabled = true
+
+    ; How many threads to keep alive even if nothing is happening
+    MinThreads = 2
+
+    ; How many threads to start at maximum load
+    MaxThreads = 100
+
+    ; Time a thread must be idle (in seconds) before it dies
+    IdleTimeout = 60
+
+    ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
+    Priority = "BelowNormal"
+
+    ; Maximum number of events to queue for a script (excluding timers)
+    MaxScriptEventQueue = 300
+
+    ; Stack size per thread created
+    ThreadStackSize = 262144
+
+    ; Rate to poll for asynchronous command replies (ms)
+    ; currently unused
+    ;AsyncLLCommandLoopms = 50
+
+    ; Save the source of all compiled scripts
+    WriteScriptSourceToDebugFile = false
+
+    ; Default language for scripts
+    DefaultCompileLanguage = lsl
+
+    ; List of allowed languages (lsl,vb,js,cs)
+    ; AllowedCompilers=lsl,cs,js,vb.  
+    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
+    AllowedCompilers=lsl
+
+    ; Compile debug info (line numbers) into the script assemblies
+    CompileWithDebugInformation = true
+
+    ; Allow the use of os* functions (some are dangerous)
+    AllowOSFunctions = false
+
+    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    OSFunctionThreatLevel = VeryLow
+
+    ; Interval (s) between background save of script states
+    SaveInterval = 120
+
+    ; Interval (s) between maintenance runs (0 = disable)
+    MaintenanceInterval = 10
+
+    ; Time a script can spend in an event handler before it is interrupted
+    EventLimit = 30
+
+    ; If a script overruns it's event limit, kill the script?
+    KillTimedOutScripts = false
+
+    ; Sets the multiplier for the scripting delays
+    ScriptDelayFactor = 1.0
+
+    ; The factor the 10 m distances llimits are multiplied by
+    ScriptDistanceLimitFactor = 1.0
+
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; Allow for llCreateLink and llBreakLink to work without asking for permission 
+    ; only enable this in a trusted environment otherwise you may be subject to hijacking
+    ; AutomaticLinkPermission = false
+
 
 [ScriptEngine.DotNetEngine]
     Enabled = true
@@ -126,3 +203,9 @@
     ; Remove old scripts on next startup
     ; currently unused
     ;CleanUpOldScriptsOnStartup=true
+
+
+[MRM]
+    ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
+    ; default is false
+	  Enabled = false 
diff --git a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example b/bin/config.preview.donotuseyet-v2/defaults/scripting.ini.defaults
similarity index 53%
rename from bin/config.preview.donotuseyet/region/scripting/regionready.ini.example
rename to bin/config.preview.donotuseyet-v2/defaults/scripting.ini.defaults
index e64139e22c..12dd042c9c 100644
--- a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example
+++ b/bin/config.preview.donotuseyet-v2/defaults/scripting.ini.defaults
@@ -1,10 +1,16 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
+; Scripting settings
+
+[LL-Functions]
+    ; Set the following to true to allow administrator owned scripts to execute console commands
+    ; currently unused
+    ; AllowosConsoleCommand=false
+
+    AllowGodFunctions = false
+
+    ; Maximum number of llListen events we allow per script
+    ; Set this to 0 to have no limit imposed.
+    max_listens_per_script = 64
+
 
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
@@ -18,3 +24,15 @@
     ; - the third field is a number indicating how many scripts failed to compile
     ; - "oar error" if supplied, provides the error message from the OAR load
     channel_notify = -800
+
+
+[SMTP]
+    enabled=false
+
+    ;enabled=true
+    ;internal_object_host=lsl.opensim.local
+    ;host_domain_header_from=127.0.0.1
+    ;SMTP_SERVER_HOSTNAME=127.0.0.1
+    ;SMTP_SERVER_PORT=25
+    ;SMTP_SERVER_LOGIN=foo
+    ;SMTP_SERVER_PASSWORD=bar
diff --git a/bin/config.preview.donotuseyet/admin/gridinfo.ini.example b/bin/config.preview.donotuseyet/admin/gridinfo.ini.example
deleted file mode 100644
index 258cecb357..0000000000
--- a/bin/config.preview.donotuseyet/admin/gridinfo.ini.example
+++ /dev/null
@@ -1,52 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[GridInfo]
-    ; These settings are used to return information on a get_grid_info call.
-    ; Client launcher scripts and third-party clients make use of this to
-    ; autoconfigure the client and to provide a nice user experience. If you
-    ; want to facilitate that, you should configure the settings here according
-    ; to your grid or standalone setup.
-    ;
-    ; See http://opensimulator.org/wiki/GridInfo
-
-    ; login uri: for grid this is the user server URI
-    login = http://127.0.0.1:9000/
-
-    ; long grid name: the long name of your grid
-    gridname = "the lost continent of hippo"
-
-    ; short grid name: the short name of your grid
-    gridnick = "hippogrid"
-
-    ; login page: optional: if it exists it will be used to tell the client to use
-    ;                       this as splash page
-    ; currently unused
-    ;welcome = http://127.0.0.1/welcome
-
-    ; helper uri: optional: if it exists if will be used to tell the client to use
-    ;                       this for all economy related things
-    ; currently unused
-    ;economy = http://127.0.0.1:9000/
-
-    ; web page of grid: optional: page providing further information about your grid
-    ; currently unused
-    ;about = http://127.0.0.1/about/
-
-    ; account creation: optional: page providing further information about obtaining
-    ;                             a user account on your grid
-    ; currently unused
-    ;register = http://127.0.0.1/register
-
-    ; help: optional: page providing further assistance for users of your grid
-    ; currently unused
-    ;help = http://127.0.0.1/help
-
-    ; password help: optional: page providing password assistance for users of your grid
-    ; currently unused
-    ;password = http://127.0.0.1/password
diff --git a/bin/config.preview.donotuseyet/admin/remoteadmin.ini.example b/bin/config.preview.donotuseyet/admin/remoteadmin.ini.example
deleted file mode 100644
index 5d6112dd96..0000000000
--- a/bin/config.preview.donotuseyet/admin/remoteadmin.ini.example
+++ /dev/null
@@ -1,34 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[RemoteAdmin]
-    enabled = false
-    access_password = unknown
-
-    ; the create_region XmlRpc call uses region_file_template to generate
-    ; the file name of newly create regions (if they are created
-    ; persistent). the parameter available are:
-    ;     {0} - X location
-    ;     {1} - Y location
-    ;     {2} - region UUID
-    ;     {3} - region port
-    ;     {4} - region name with " ", ":", "/" mapped to  "_"
-
-    region_file_template = "{0}x{1}-{2}.xml"
-
-    ; we can limit the number of regions that XmlRpcCreateRegion will
-    ; allow by setting this to a positive, non-0 number: as long as the
-    ; number of regions is below region_limits, XmlRpcCreateRegion will
-    ; succeed. setting region_limit to 0 disables the check.
-    ; default is 0
-    ;region_limit = 0
-
-    ; enable only those methods you deem to be appropriate using a | delimited whitelist
-    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml    
-    ; if this parameter is not specified but enabled = true, all methods will be available
-    enabled_methods = all
diff --git a/bin/config.preview.donotuseyet/admin/rest.ini.example b/bin/config.preview.donotuseyet/admin/rest.ini.example
deleted file mode 100644
index e310eb9fb2..0000000000
--- a/bin/config.preview.donotuseyet/admin/rest.ini.example
+++ /dev/null
@@ -1,32 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[RestPlugins]
-    ; Change this to true to enable REST Plugins. This must be true if you wish to use
-    ; REST Region or REST Asset and Inventory Plugins
-    enabled = false
-    god_key = SECRET
-    prefix = /admin
-
-
-[RestRegionPlugin]
-    ; Change this to true to enable the REST Region Plugin
-    enabled = false
-
-
-[RestHandler]
-  ; Change this to true to enable the REST Asset and Inventory Plugin
-  enabled = false
-  authenticate=true
-  secured=true
-  extended-escape=true
-  realm=OpenSim REST
-  dump-asset=false
-  path-fill=true
-  dump-line-size=32
-  flush-on-error=true
diff --git a/bin/config.preview.donotuseyet/protocols/grid/interregion.ini.example b/bin/config.preview.donotuseyet/protocols/grid/interregion.ini.example
deleted file mode 100644
index 0199636785..0000000000
--- a/bin/config.preview.donotuseyet/protocols/grid/interregion.ini.example
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Communications]
-
-;InterregionComms = "LocalComms"
-InterregionComms = "RESTComms"
diff --git a/bin/config.preview.donotuseyet/protocols/intergrid/ogp.ini.example b/bin/config.preview.donotuseyet/protocols/intergrid/ogp.ini.example
deleted file mode 100644
index 90afcf0e72..0000000000
--- a/bin/config.preview.donotuseyet/protocols/intergrid/ogp.ini.example
+++ /dev/null
@@ -1,16 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[OpenGridProtocol]
-    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
-    ;On/true or Off/false
-    ogp_enabled=false
-
-    ;Name Prefix/suffix when using OGP
-    ogp_firstname_prefix=""
-    ogp_lastname_suffix="_EXTERNAL"
diff --git a/bin/config.preview.donotuseyet/region/scripting/engines/mrm.ini.example b/bin/config.preview.donotuseyet/region/scripting/engines/mrm.ini.example
deleted file mode 100644
index 0c194ae386..0000000000
--- a/bin/config.preview.donotuseyet/region/scripting/engines/mrm.ini.example
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[MRM]
-    ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
-    ; default is false
-	  Enabled = false 
diff --git a/bin/config.preview.donotuseyet/region/scripting/engines/xengine.ini.example b/bin/config.preview.donotuseyet/region/scripting/engines/xengine.ini.example
deleted file mode 100644
index b65e42237d..0000000000
--- a/bin/config.preview.donotuseyet/region/scripting/engines/xengine.ini.example
+++ /dev/null
@@ -1,88 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[XEngine]
-    ; Enable this engine in this OpenSim instance
-    Enabled = true
-
-    ; How many threads to keep alive even if nothing is happening
-    MinThreads = 2
-
-    ; How many threads to start at maximum load
-    MaxThreads = 100
-
-    ; Time a thread must be idle (in seconds) before it dies
-    IdleTimeout = 60
-
-    ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
-    Priority = "BelowNormal"
-
-    ; Maximum number of events to queue for a script (excluding timers)
-    MaxScriptEventQueue = 300
-
-    ; Stack size per thread created
-    ThreadStackSize = 262144
-
-    ; Rate to poll for asynchronous command replies (ms)
-    ; currently unused
-    ;AsyncLLCommandLoopms = 50
-
-    ; Save the source of all compiled scripts
-    WriteScriptSourceToDebugFile = false
-
-    ; Default language for scripts
-    DefaultCompileLanguage = lsl
-
-    ; List of allowed languages (lsl,vb,js,cs)
-    ; AllowedCompilers=lsl,cs,js,vb.  
-    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
-    AllowedCompilers=lsl
-
-    ; Compile debug info (line numbers) into the script assemblies
-    CompileWithDebugInformation = true
-
-    ; Allow the use of os* functions (some are dangerous)
-    AllowOSFunctions = false
-
-    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
-    OSFunctionThreatLevel = VeryLow
-
-    ; Interval (s) between background save of script states
-    SaveInterval = 120
-
-    ; Interval (s) between maintenance runs (0 = disable)
-    MaintenanceInterval = 10
-
-    ; Time a script can spend in an event handler before it is interrupted
-    EventLimit = 30
-
-    ; If a script overruns it's event limit, kill the script?
-    KillTimedOutScripts = false
-
-    ; Sets the multiplier for the scripting delays
-    ScriptDelayFactor = 1.0
-
-    ; The factor the 10 m distances llimits are multiplied by
-    ScriptDistanceLimitFactor = 1.0
-
-    ; OS Functions enable/disable
-    ; For each function, you can add one line, as shown
-    ; The default for all functions allows them if below threat level
-
-    ; true allows the use of the function unconditionally
-    ; Allow_osSetRegionWaterHeight = true
-
-    ; false disables the function completely
-    ; Allow_osSetRegionWaterHeight = false
-
-    ; Comma separated list of UUIDS allows the function for that list of UUIDS
-    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-
-    ; Allow for llCreateLink and llBreakLink to work without asking for permission 
-    ; only enable this in a trusted environment otherwise you may be subject to hijacking
-    ; AutomaticLinkPermission = false
diff --git a/bin/config.preview.donotuseyet/region/scripting/ll-functions.ini.example b/bin/config.preview.donotuseyet/region/scripting/ll-functions.ini.example
deleted file mode 100644
index e7ab7a97db..0000000000
--- a/bin/config.preview.donotuseyet/region/scripting/ll-functions.ini.example
+++ /dev/null
@@ -1,18 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[LL-Functions]
-    ; Set the following to true to allow administrator owned scripts to execute console commands
-    ; currently unused
-    ; AllowosConsoleCommand=false
-
-    AllowGodFunctions = false
-
-    ; Maximum number of llListen events we allow per script
-    ; Set this to 0 to have no limit imposed.
-    max_listens_per_script = 64
diff --git a/bin/config.preview.donotuseyet/region/scripting/smtp.ini.example b/bin/config.preview.donotuseyet/region/scripting/smtp.ini.example
deleted file mode 100644
index 5b423ab0ec..0000000000
--- a/bin/config.preview.donotuseyet/region/scripting/smtp.ini.example
+++ /dev/null
@@ -1,19 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[SMTP]
-
-    enabled=false
-
-    ;enabled=true
-    ;internal_object_host=lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
-    ;SMTP_SERVER_PORT=25
-    ;SMTP_SERVER_LOGIN=foo
-    ;SMTP_SERVER_PASSWORD=bar
diff --git a/bin/config.preview.donotuseyet/region/user/chat/chat.ini.example b/bin/config.preview.donotuseyet/region/user/chat/chat.ini.example
deleted file mode 100644
index 4e392563a4..0000000000
--- a/bin/config.preview.donotuseyet/region/user/chat/chat.ini.example
+++ /dev/null
@@ -1,20 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Chat]
-    ; Controls whether the chat module is enabled.  Default is true.
-    enabled = true;
-
-    ; Distance in meters that whispers should travel.  Default is 10m
-    whisper_distance = 10
-
-    ; Distance in meters that ordinary chat should travel.  Default is 30m
-    say_distance = 30
-
-    ; Distance in meters that shouts should travel.  Default is 100m
-    shout_distance = 100
diff --git a/bin/config.preview.donotuseyet/region/user/chat/irc.ini.example b/bin/config.preview.donotuseyet/region/user/chat/irc.ini.example
deleted file mode 100644
index a94a89e566..0000000000
--- a/bin/config.preview.donotuseyet/region/user/chat/irc.ini.example
+++ /dev/null
@@ -1,61 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-; Uncomment the following for IRC bridge
-; experimental, so if it breaks... keep both parts... yada yada
-; also, not good error detection when it fails
-;[IRC]
-    ;enabled = true ; you need to set this otherwise it won't connect
-    ;server  = name.of.irc.server.on.the.net
-    ;; user password - only use this if the server requires one
-    ;password = mypass
-    ;nick    = OpenSimBotNameProbablyMakeThisShorter
-    ;channel = #the_irc_channel_you_want_to_connect_to
-    ;port = 6667
-    ;; channel to listen for configuration commands
-    ;commands_enabled = false
-    ;command_channel = 2777
-    ;report_clients = true
-    ;; relay private chat connections
-    ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
-    ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
-    ;; relay_private_channel_in -- channel to receive message from the IRC bridge
-    ;; relay_chat = false: IRC bridge will not relay normal chat
-    ;; access_password -- simple security device
-    ;;
-    ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
-    ;;
-    ;;     relay_private_channels = false
-    ;;     relay_chat = true
-    ;;
-    ;; to relay chat only to/from private in-world channels:
-    ;;
-    ;;     relay_chat = false
-    ;;     relay_private_channels = true
-    ;;     relay_private_channel_in = 2226
-    ;;     relay_private_channel_out = 2225
-    ;;
-    ;; in this example, all chat coming in from IRC will be send out via
-    ;; in-world channel 2226, and all chat from in-world channel 2225 will
-    ;; be relayed to the IRC channel.
-    ;;
-    ;relay_private_channels = false
-    ;relay_private_channel_in = 2226
-    ;relay_private_channel_out = 2225
-    ;relay_chat = true
-    ;access_password = foobar
-
-    ;fallback_region = name of "default" region
-    ;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
-    ; must start with "PRIVMSG {0} : " or irc server will get upset
-    ;for <bot>:<user in region> :<message>
-    ;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
-    ;for <bot>:<message> - <user of region> :
-    msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
-    ;for <bot>:<message> - from <user> :
-    ;msgformat = "PRIVMSG {0} : {3} - from {1}"
diff --git a/bin/config.preview.donotuseyet/region/user/chat/messaging.ini.example b/bin/config.preview.donotuseyet/region/user/chat/messaging.ini.example
deleted file mode 100644
index f7f708b431..0000000000
--- a/bin/config.preview.donotuseyet/region/user/chat/messaging.ini.example
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Messaging]
-    ; Control which region module is used for instant messaging.
-    ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
-    InstantMessageModule = InstantMessageModule
diff --git a/bin/config.preview.donotuseyet/region/user/economy.ini.example b/bin/config.preview.donotuseyet/region/user/economy.ini.example
deleted file mode 100644
index 33343bf4a6..0000000000
--- a/bin/config.preview.donotuseyet/region/user/economy.ini.example
+++ /dev/null
@@ -1,64 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Economy]
-    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
-    ; In grid mode, use this currency XMLRPC server.  Leave blank for normal functionality
-    CurrencyServer = ""
-    ; "http://192.168.1.127/currency.php"
-
-    ; In grid mode, this is the land XMLRPC server. Leave blank for normal functionality
-    LandServer = ""
-    ;"http://192.168.1.127/landtool.php"
-
-    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
-    ObjectCapacity = 45000
-
-    ; Money Unit fee to upload textures, animations etc
-    PriceUpload = 0
-
-    ; Money Unit fee to create groups
-    PriceGroupCreate = 0
-
-    ; This is the account Money goes to for fees.  Remember, economy requires that money circulates somewhere... even if it's an upload fee
-    EconomyBaseAccount = 00000000-0000-0000-0000-000000000000
-
-    ; This is the type of user that will pay fees.
-    ; Set this to 2 for users, estate managers and Estate Owners
-    ; Set this to 1 for Users and Estate Managers
-    ; Set this to 0 for Users only.
-    ; -1 disables
-    UserLevelPaysFees = -1
-
-    ; Amount to give to user as a stipend
-    UserStipend = 1000
-
-    ; When a user gets low on money units and logs off, then logs back on, issue a new stipend if they have less money units then this
-    ; amount. Be aware that the account money isn't stored anywhere so users will get a stipend if you restart the simulator
-    IssueStipendWhenClientIsBelowAmount = 10
-
-    ; If this is true, the simulator will remember account balances until the simulator is shutdown or restarted.
-    KeepMoneyAcrossLogins = true
-
-    ; We don't really know what the rest of these values do.  These get sent to the client
-    ; These taken from Agni at a Public Telehub.  Change at your own risk.
-    ObjectCount = 0
-    PriceEnergyUnit = 100
-    PriceObjectClaim = 10
-    PricePublicObjectDecay = 4
-    PricePublicObjectDelete = 4
-    PriceParcelClaim = 1
-    PriceParcelClaimFactor = 1
-
-    PriceRentLight = 5
-    TeleportMinPrice = 2
-    TeleportPriceExponent = 2
-    EnergyEfficiency = 1
-    PriceObjectRent = 1
-    PriceObjectScaleFactor = 10
-    PriceParcelRent = 1
diff --git a/bin/config.preview.donotuseyet/region/user/voice/asterisk.ini.example b/bin/config.preview.donotuseyet/region/user/voice/asterisk.ini.example
deleted file mode 100644
index fc0b0e8bd7..0000000000
--- a/bin/config.preview.donotuseyet/region/user/voice/asterisk.ini.example
+++ /dev/null
@@ -1,23 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[AsteriskVoice]
-    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
-    enabled = false
-    ; SIP account server domain
-    sip_domain = testserver.com
-    ; SIP conf server domain
-    conf_domain = testserver.com
-    ; URL of the asterisk opensim frontend
-    asterisk_frontend = http://testserver.com:49153/
-    ; password for the asterisk frontend XmlRpc calls
-    asterisk_password = bah-humbug
-    ; timeout for XmlRpc calls to asterisk front end (in ms)
-    asterisk_timeout = 3000
-    ; salt for asterisk nonces
-    asterisk_salt = paluempalum
diff --git a/bin/config.preview.donotuseyet/region/user/voice/voice.ini.example b/bin/config.preview.donotuseyet/region/user/voice/voice.ini.example
deleted file mode 100644
index 6485f20163..0000000000
--- a/bin/config.preview.donotuseyet/region/user/voice/voice.ini.example
+++ /dev/null
@@ -1,17 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Voice]
-    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
-    enabled = false
-    ; This is not supported by the SLViewer right now and
-    ; hardcoded within the SL Viewer. Maybe it will be
-    ; changed in future. :-)
-    account_management_server = https://www.bhr.vivox.com/api2
-    ; Global SIP Server for conference calls
-    sip_domain = testserver.com
diff --git a/bin/config.preview.donotuseyet/region/world/contentmanagement/cms.ini.example b/bin/config.preview.donotuseyet/region/world/contentmanagement/cms.ini.example
deleted file mode 100644
index d5a624d9a7..0000000000
--- a/bin/config.preview.donotuseyet/region/world/contentmanagement/cms.ini.example
+++ /dev/null
@@ -1,11 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-;[CMS]
-    ;enabled = true
-    ;channel = 345
diff --git a/bin/config.preview.donotuseyet/region/world/contentmanagement/datasnapshot.ini.example b/bin/config.preview.donotuseyet/region/world/contentmanagement/datasnapshot.ini.example
deleted file mode 100644
index 285fccfd70..0000000000
--- a/bin/config.preview.donotuseyet/region/world/contentmanagement/datasnapshot.ini.example
+++ /dev/null
@@ -1,33 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[DataSnapshot]
-    ; The following set of configs pertains to search.
-    ; Set index_sims to true to enable search engines to index your searchable data
-    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
-    ; default is false
-    index_sims = false
-
-    ; The variable data_exposure controls what the regions expose:
-    ;    minimum: exposes only things explicitly marked for search
-    ;    all: exposes everything
-    data_exposure = minimum
-
-    ; If search is on, change this to your grid name; will be ignored for standalones
-    gridname = "OSGrid"
-
-    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
-    ; Later, you may want to increase this to 3600 (1 hour) or more
-    default_snapshot_period = 1200
-
-    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
-
-    ; This semicolon-separated string serves to notify specific data services about the existence 
-    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
-    ;data_services="http://metaverseink.com/cgi-bin/register.py"
diff --git a/bin/config.preview.donotuseyet/region/world/contentmanagement/svn.ini.example b/bin/config.preview.donotuseyet/region/world/contentmanagement/svn.ini.example
deleted file mode 100644
index 802c143b67..0000000000
--- a/bin/config.preview.donotuseyet/region/world/contentmanagement/svn.ini.example
+++ /dev/null
@@ -1,17 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[SVN]
-    Enabled = false
-    Directory = SVNmodule\repo
-    URL = "svn://your.repo.here/"
-    Username = "user"
-    Password = "password"
-    ImportOnStartup = false
-    Autosave = false
-    AutoSavePeriod = 15 ; Number of minutes between autosave backups
diff --git a/bin/config.preview.donotuseyet/region/world/sun.ini.example b/bin/config.preview.donotuseyet/region/world/sun.ini.example
deleted file mode 100644
index b98a74e086..0000000000
--- a/bin/config.preview.donotuseyet/region/world/sun.ini.example
+++ /dev/null
@@ -1,20 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-; Uncomment the following to control the progression of daytime
-; in the Sim.  The defaults are what is shown below
-;[Sun]
-    ; number of wall clock hours for an opensim day.  24.0 would mean realtime
-    ;day_length = 4
-    ; Year length in days
-    ;year_length = 60
-    ; Day to Night Ratio
-    ;day_night_offset = 0.45
-    ; send a Sun update every update_interval # of frames.  A lower number will
-    ; make for smoother sun transition at the cost of network
-    ;update_interval = 100
diff --git a/bin/config.preview.donotuseyet/region/world/trees.ini.example b/bin/config.preview.donotuseyet/region/world/trees.ini.example
deleted file mode 100644
index f3151ef9c9..0000000000
--- a/bin/config.preview.donotuseyet/region/world/trees.ini.example
+++ /dev/null
@@ -1,15 +0,0 @@
-; This file shows initialization defaults for OpenSimulator.  If you want to override these
-; please copy/rename this file from .ini.example file to .ini.  For example
-;
-; chat.ini.example => chat.ini
-;
-; or you can copy and paste the settings from this file directly to bin/OpenSim.ini
-;
-
-[Trees]
-    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
-    ; default is false
-    active_trees = false
-
-    ; Density of tree population
-    tree_density = 1000.0