1 files changed, 37 insertions, 149 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c4b421d..1f8fca2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -19,13 +19,6 @@
     ; inside your firewall, separate patterns with a ';'
     ; HttpProxyExceptions = ".mydomain.com;localhost"
 
-    ; Set this to true if you are connecting your regions to a grid
-    ; Set this to false if you are running in standalone mode
-    gridmode = false
-
-    ; Set this to true if you want Hypergrid functionality
-    hypergrid = false
-
     startup_console_commands_file = "startup_commands.txt"
     shutdown_console_commands_file = "shutdown_commands.txt"
 
@@ -44,13 +37,6 @@
     ; performance on .NET/Windows
     async_call_method = SmartThreadPool
 
-    ; There are several operations on large collections (such as
-    ; the current avatar list) that can be run synchronously or
-    ; in parallel. Running in parallel should increase performance
-    ; on a multi-core system, but will make debugging more
-    ; difficult if something deadlocks or times out
-    use_async_when_possible = false
-
     ; Max threads to allocate on the FireAndForget thread pool
     ; when running with the SmartThreadPool option above
     MaxPoolThreads = 15
@@ -118,7 +104,7 @@
     ;InworldRestartShutsDown = false
 
     ; ##
-    ; ## STORAGE
+    ; ## PRIM STORAGE
     ; ##
 
     ; *** Prim Storage - only leave one storage_plugin uncommented ***
@@ -126,15 +112,21 @@
     ;storage_plugin = "OpenSim.Data.Null.dll"
 
     ; --- To use sqlite as region storage:
-    ; NOTE: SQLite and OpenSim are not functioning properly with Mono 2.4.3 or greater.
-    ; If you are using Mono you probably should be using MySQL
+    ;
+    ; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is 
+    ; not compatible with the sqlite3 library installed on Mac OSX.  If you're using Mono 2.4 you can still use the old sqlite
+    ; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll).  Unfortunately, the older library
+    ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead
+    ;
+    ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode
     storage_plugin = "OpenSim.Data.SQLite.dll"
+    ;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll"
     storage_connection_string="URI=file:OpenSim.db,version=3";
 
     ; --- To use MySQL storage, supply your own connection string (this is only an example):
     ;     note that the supplied account needs create privilegies if you want it to auto-create needed tables.
     ;
-    ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully!
+    ; -->>> There are multiple connection strings defined in several places. Check it carefully!
     ;
     ; storage_plugin="OpenSim.Data.MySQL.dll"
     ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
@@ -142,15 +134,6 @@
     ; 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.
-
     ; 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.
@@ -273,6 +256,10 @@
     ; to be enabled from the console if this is set
     ; StartDisabled = false
 
+    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
+    ; OpenJPEG if false
+    ; UseCSJ2K = true
+
 [SMTP]
     enabled=false
 
@@ -284,63 +271,11 @@
     ;SMTP_SERVER_LOGIN=foo
     ;SMTP_SERVER_PASSWORD=bar
 
-
-[Communications]
-    ;InterregionComms = "LocalComms"
-    InterregionComms = "RESTComms"
-
-
-[StandAlone]
-    ; If this is set to true then OpenSim only allows in users who already have accounts.
-    ; An account can be created using the "create user" console command.
-    ;
-    ; If this is set to false then an account is automatically created for a user who logs in
-    ; without one.  PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED.
-    ; Therefore, any user can log into any account.  If accounts_authenticate is later switched to
-    ; true then the passwords will need to be reset (using the "reset user password" console command) since
-    ; automatically created accounts have their password set to the string "test".
-    ;
-    ; This setting applies to standalone mode only, not grid or other modes.  Default is true.
-    accounts_authenticate = true
-
-    welcome_message = "Welcome to OpenSimulator"
-
-    ; Inventory database provider
-    inventory_plugin = "OpenSim.Data.SQLite.dll"
-    ; inventory_plugin = "OpenSim.Data.MySQL.dll"
-
-    ; Inventory source SQLite example
-    inventory_source = "URI=file:inventoryStore.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"
-
-    ; User source SQLite example
-    user_source = "URI=file:userprofiles.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"
-
 [Network]
     ConsoleUser = "Test"
     ConsolePass = "secret"
     http_listener_port = 9000
     console_port = 0
-    default_location_x = 1000
-    default_location_y = 1000
 
     ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
     ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
@@ -357,21 +292,6 @@
     ; Uncomment below to enable llRemoteData/remote channels
     ; remoteDataPort = 20800
 
-    grid_server_url = "http://127.0.0.1:8003"
-    grid_send_key = "null"
-    grid_recv_key = "null"
-
-    user_server_url = "http://127.0.0.1:8002"
-    user_send_key = "null"
-    user_recv_key = "null"
-
-    asset_server_url = "http://127.0.0.1:8003"
-
-    inventory_server_url = "http://127.0.0.1:8003"
-
-    ; The MessagingServer is a companion of the UserServer. It uses
-    ; user_send_key and user_recv_key, too
-    messaging_server_url = "http://127.0.0.1:8006"
 
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
@@ -857,7 +777,7 @@
     ; default is 1000
     cloud_update_rate = 1000
 
-[Meta7Windlight]
+[LightShare]
 
     ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
     ; It has no ill effect on viewers which do not support server-side windlight settings.
@@ -1074,52 +994,6 @@
     ; DisableUndergroundMovement = true
 
 
-[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
-
-
 [OpenGridProtocol]
     ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
     ;On/true or Off/false
@@ -1314,10 +1188,18 @@
     ;MessagingModule = GroupsMessagingModule
     ;MessagingEnabled = true
 
-    ; Service connector to Groups Service [Select One]
-    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
+    ; Service connector to Groups Service [Select One] ServicesConnectorModule
+
+        
+    ; Simian Grid Service for Groups
+    ;ServicesConnectorModule = SimianGroupsServicesConnector
+    ;GroupsServerURI = http://mygridserver.com:82/Grid/
+
+    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service settings
     ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
-    ;XmlRpcServiceURL        = http://yourxmlrpcserver.com/xmlrpc.php
+    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
+
+    ; XmlRpc Service Settings
     ;XmlRpcServiceReadKey    = 1234
     ;XmlRpcServiceWriteKey   = 1234
 
@@ -1361,11 +1243,6 @@
 ;; These defaults allow OpenSim to work out of the box with
 ;; zero configuration
 ;;
-[DatabaseService]
-    ;; default standalone, overridable in StandaloneCommon.ini
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-
-
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
@@ -1388,6 +1265,7 @@
     ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
     ;Include-Grid         = "config-include/Grid.ini"
     ;Include-HGGrid       = "config-include/GridHypergrid.ini"
+    ;Include-SimianGrid   = "config-include/SimianGrid.ini"
 
     ; Then choose
     ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
@@ -1414,3 +1292,13 @@
 
     ;XmlRpcRouterModule = "XmlRpcRouterModule"
     ;XmlRpcPort = 20800
+
+[Friends]
+    ; The port the friendslist interregion comms will listen on
+    ; Defaults to the simulator's TCP port
+    ;Port = 0
+
+    ; Uncomment one of the lines below. Use FriendsService for local
+    ; operation, Connectors for remote operation
+    ;Connector = "OpenSim.Services.FriendsService.dll"
+    Connector = "OpenSim.Services.Connectors.dll"