12 files changed, 438 insertions, 155 deletions

diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
new file mode 100644
index 0000000..fea0ea2
--- /dev/null
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -0,0 +1,157 @@
+;; Configurations for enabling HG1.5
+;; 
+;; Run
+;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini
+
+;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
+;;                     OpenSim.Server.Handlers.dll:UserAgentService
+;;                     OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector
+;; An additional OpenSim.Server.Handlers.dll:AssetServiceConnector is started
+;; in port 8002, outside the firewall
+;;
+
+[Startup]
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+
+; * This is common for all services, it's the network setup for the entire
+; * server instance, if none if specified above
+; *
+[Network]
+    port = 8003
+
+; * The following are for the remote console
+; * They have no effect for the local or basic console types
+; * Leave commented to diable logins to the console
+;ConsoleUser = Test
+;ConsolePass = secret
+;ConsolePort = 0
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
+; * As an example, the below configuration precisely mimicks the legacy
+; * asset server. It is read by the asset IN connector (defined above)
+; * and it then loads the OUT connector (a local database module). That,
+; * in turn, reads the asset loader and database connection information
+; *
+[AssetService]
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+; * This configuration loads the inventory server modules. It duplicates
+; * the function of the legacy inventory server
+; *
+[InventoryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    SessionAuthentication = "false"
+
+; * This is the new style grid service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "regions", which uses the legacy tables
+; *
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
+    ; AllowDuplicateNames = "True"
+    ;; 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, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
+    ;; For example: 
+    ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
+    ; (replace spaces with underscore)
+
+; * This is the configuration for the freeswitch server in grid mode
+[FreeswitchService]
+    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+; * This is the new style authentication service. Currently, only MySQL
+; * is implemented. "Realm" is the table that is used for user lookup.
+; * By setting it to "users", you can use the old style users table
+; * as an authentication source.
+; *
+[AuthenticationService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+
+[OpenIdService]
+    ; for the server connector
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        
+; * This is the new style user service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "users", which uses the legacy tables
+; *
+[UserAccountService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+
+[PresenceService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+
+[AvatarService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+[LibraryService]
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[LoginService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    ; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+
+    WelcomeMessage = "Welcome, Avatar!"
+    ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
+    ; CHANGE THIS
+    HomeURI = "http://127.0.0.1:8002"
+    GatekeeperURI = "http://127.0.0.1:8002"
+    InventoryServerURI = "http://127.0.0.1:8002"
+    AssetServerURI = "http://127.0.0.1:8002"
+
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    ; how does the outside world reach me? This acts as public key too.
+    ; CHANGE THIS
+    ExternalName = "http://127.0.0.1:8002"
+
+[UserAgentService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+
+;; 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 
+;; 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.InventoryService.dll:HGInventoryService"
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 372923b..0535765 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -1,21 +1,23 @@
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
 ; * Multiple connectors should be seaprated by commas.
+; * The startup section lists all the connectors to start up in this server
+; * instance. This may be only one, or it may be the entire server suite.
+; * Multiple connectors should be seaprated by commas.
 ; *
 ; * These are the IN connectors the server uses, the in connectors
-; * read this config file and load the needed OUT and database connectors
+; * read this config file and load the needed service and database connectors
 ; *
-; * Add "OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" to
-; * enable the experimental authentication service
 ; *
 [Startup]
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector"
+
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
-; * server instance
+; * server instance, if none if specified above
 ; *
 [Network]
-port = 8003
+    port = 8003
 
 ; * The following are for the remote console
 ; * They have no effect for the local or basic console types
@@ -24,31 +26,47 @@ port = 8003
 ;ConsolePass = secret
 ;ConsolePort = 0
 
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
+
 ; * As an example, the below configuration precisely mimicks the legacy
 ; * asset server. It is read by the asset IN connector (defined above)
 ; * and it then loads the OUT connector (a local database module). That,
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-AssetLoaderArgs = "assets/AssetSets.xml"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
 
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
 ; *
 [InventoryService]
-LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-UserServerURI = "http://127.0.0.1:8002"
-SessionAuthentication = "false"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    SessionAuthentication = "false"
+
+; * This is the new style grid service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "regions", which uses the legacy tables
+; *
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
+    ; AllowDuplicateNames = "True"
+    ;; 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, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
+    ;; For example: 
+    ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
+    ; (replace spaces with underscore)
 
 ; * This is the configuration for the freeswitch server in grid mode
 [FreeswitchService]
-LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
 
 ; * This is the new style authentication service. Currently, only MySQL
 ; * is implemented. "Realm" is the table that is used for user lookup.
@@ -56,20 +74,54 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
 ; * as an authentication source.
 ; *
 [AuthenticationService]
-AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
-; Realm = "users"
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
+[OpenIdService]
+    ; for the server connector
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
 ; * It defaults to "users", which uses the legacy tables
 ; *
 [UserAccountService]
-AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
-; Realm = "users"
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ; Realm = "useraccounts"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+
+[PresenceService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+
+[AvatarService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+[LibraryService]
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[LoginService]
+    ; for the server connector
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    ; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
+
+    WelcomeMessage = "Welcome, Avatar!"
 
 ; * This is the new style grid service.
 ; * "Realm" is the table that is used for user lookup.
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ebc9b24..dd487b7 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"
 
@@ -118,7 +111,7 @@
     ;InworldRestartShutsDown = false
 
     ; ##
-    ; ## STORAGE
+    ; ## PRIM STORAGE
     ; ##
 
     ; *** Prim Storage - only leave one storage_plugin uncommented ***
@@ -134,7 +127,7 @@
     ; --- 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 +135,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.
@@ -284,63 +268,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 +289,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
@@ -1062,7 +979,7 @@
     ; DisableUndergroundMovement = true
 
 
-[GridInfo]
+[GridInfoService]
     ; 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
@@ -1361,7 +1278,7 @@
 
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     ;; The following is the configuration section for the new style services
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index 8d833df..d45fe9d 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -20,17 +20,6 @@ AllowAlternatePorts = False
 ExternalHostName = "SYSTEMIP"
 
 ; *
-; * Master avatar stuff. Set either a UUID (from OSGrid or your server)
-; * OR a first and last name. Password is only needed for sandbox mode
-; * The default assigns no master avatar
-; *
-
-MasterAvatarUUID = "00000000-0000-0000-0000-000000000000"
-; MasterAvatarFirstName = ""
-; MasterAvatarLastName = ""
-; MasterAvatarSandboxPassword = ""
-
-; *
 ; * Prim data
 ; * This allows limiting the sizes of prims and the region prim count
 ; *
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 773de44..1d7f2a4 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -343,6 +343,12 @@
     <Key Name="assetType" Value="0" />
     <Key Name="fileName" Value="femaleface.jp2"/>
   </Section>
+  <Section Name="Hyperlink Map Texture">
+    <Key Name="assetID" Value="00000000-0000-1111-9999-000000000013"/>
+    <Key Name="name" Value="Hyperlink Map Texture"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="hg2.jp2"/>
+  </Section>
   <Section Name="Moon">
     <Key Name="assetID" Value="ec4b9f0b-d008-45c6-96a4-01dd947ac621"/>
     <Key Name="name" Value="Moon"/>
diff --git a/bin/assets/TexturesAssetSet/hg2.jp2 b/bin/assets/TexturesAssetSet/hg2.jp2
new file mode 100644
index 0000000..9a66fd3
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/hg2.jp2
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..56c76c6 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,27 @@
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
     InventoryServices = "RemoteInventoryServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
     GridServices = "RemoteGridServicesConnector"
-    NeighbourServiceInConnector = true
+    AvatarServices = "RemoteAvatarServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
     LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
+
 
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        ; for the LocalGridServicesConnector which is used by the Remote one
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    
\ No newline at end of file
+    
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..a62868e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -20,6 +20,31 @@
     ; change this to your grid-wide grid server
     ;
     GridServerURI = "http://mygridserver.com:8003"
+    ;AllowHypergridMapSearch = true
+
+[AvatarService]
+    ;
+    ; change this to your grid-wide grid server
+    ;
+    AvatarServerURI = "http://mygridserver.com:8003"
+
+[PresenceService]
+    ;
+    ; change this to your grid-wide presence server
+    ;
+    PresenceServerURI = "http://mygridserver.com:8003"
+
+[UserAccountService]
+    ;
+    ; change this to your grid-wide user accounts server
+    ;
+    UserAccountServerURI = "http://mygridserver.com:8003"
+
+[AuthenticationService]
+    ;
+    ; change this to your grid-wide authentication server
+    ;
+    AuthenticationServerURI = "http://mygridserver.com:8003"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..7391278 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,18 +7,23 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
-[Startup]
-        hypergrid = true
-
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
+    GridServices = "RemoteGridServicesConnector"
+    AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
-    GridServices = "HGGridServicesConnector"
-    NeighbourServiceInConnector = true
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
     LandServiceInConnector = true
-    HypergridServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -29,9 +34,9 @@
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
         ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
         ; which in turn uses this
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+        AllowHypergridMapSearch = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..bd90df4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -11,9 +11,16 @@
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "LocalSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
     LibraryModule = true
+    LLLoginServiceInConnector = true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,10 +28,47 @@
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
     
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
+
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
+[AuthenticationService]
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
 [GridService]
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+    ;; These are for creating new accounts
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
+    WelcomeMessage = "Welcome, Avatar!"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1679f93..8e21a8c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,7 +39,23 @@
     ;;--- For MySql region storage (alternative)
         ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
         ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;; Next, we can specify properties of regions, including default and fallback regions
+    ;; The syntax is: Region_<RegioName> = "<flags>"
+    ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;; For example:
+    Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
-    ;LibraryName = "My World's Library"
\ No newline at end of file
+    ;LibraryName = "My World's Library"
+    
+[LoginService]
+    WelcomeMessage = "Welcome, Avatar!"
+
+    HomeURI = "http://127.0.0.1:9000"
+    GatekeeperURI = "http://127.0.0.1:9000"
+    InventoryServerURI = "http://127.0.0.1:9000"
+    AssetServerURI = "http://127.0.0.1:9000"
+
+[GatekeeperService]
+    ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..a4fa5be 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -6,25 +6,30 @@
 
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
-
-[Startup]
-        hypergrid = true
         
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    NeighbourServices = "LocalNeighbourServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
+    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
     LibraryModule = true
+    LLLoginServiceInConnector = true
+    AuthenticationServiceInConnector = true
+    SimulationServiceInConnector = true
 
 [AssetService]
-    ; For the AssetServiceInConnector
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
 
     ; For HGAssetBroker
@@ -32,23 +37,78 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
 
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
-    ; For the HGAuthServiceInConnector
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
-    
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
         ; LocalGridServicesConnector needs this
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
         Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+        
+        AllowHypergridMapSearch = true
+        
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+
+
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+        ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    ; how does the outside world reach me? This acts as public key too.
+
+[UserAgentService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        ;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+        
+;; The interface that local users get when they are in other grids
+;; This greatly restricts the inventory operations while in other grids
+[HGInventoryService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"