From a58859a0d4206c194c9c56212218e2cafc2cc373 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 May 2010 21:29:56 -0700
Subject: GridUserService in place. Replaces the contrived concept of storing
 user's home and position info in the presence service. WARNING: I violated a
 taboo by deleting 2 migration files and simplifying the original table
 creation for Presence. This should not cause any problems to anyone, though.
 Things will work with the new simplified table, as well as with the previous
 contrived one. If there are any problems, solving them is as easy as dropping
 the presence table and deleting its row in the migrations table. The presence
 info only exists during a user's session anyway.

BTW, the Meshing files want to be committed too -- EOFs.
---
 bin/config-include/StandaloneHypergrid.ini | 65 ++++++++++++++++--------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'bin/config-include/StandaloneHypergrid.ini')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 35e6f20..130e210 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,25 +5,27 @@
 ;;
 	
 [Modules]
-    AssetServices = "HGAssetBroker"
-    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
-    SimulationServices = "RemoteSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "HGEntityTransferModule"
-    InventoryAccessModule = "HGInventoryAccessModule"
-    InventoryServiceInConnector = true
-    AssetServiceInConnector = true
-    HypergridServiceInConnector = true
-    NeighbourServiceInConnector = true
-    LibraryModule = true
-    LLLoginServiceInConnector = true
-    AuthenticationServiceInConnector = true
-    SimulationServiceInConnector = true
+    AssetServices			= "HGAssetBroker"
+    InventoryServices		= "HGInventoryBroker"
+    NeighbourServices		= "LocalNeighbourServicesConnector"
+    AuthenticationServices	= "LocalAuthenticationServicesConnector"
+    GridServices			= "LocalGridServicesConnector"
+    PresenceServices		= "LocalPresenceServicesConnector"
+    UserAccountServices		= "LocalUserAccountServicesConnector"
+    GridUserServices        = "LocalGridUserServicesConnector"
+    SimulationServices		= "RemoteSimulationConnectorModule"
+    AvatarServices			= "LocalAvatarServicesConnector"
+    EntityTransferModule	= "HGEntityTransferModule"
+    InventoryAccessModule	= "HGInventoryAccessModule"
+    
+    InventoryServiceInConnector			= true
+    AssetServiceInConnector				= true
+    HypergridServiceInConnector			= true
+    NeighbourServiceInConnector			= true
+    LibraryModule						= true
+    LLLoginServiceInConnector			= true
+    AuthenticationServiceInConnector	= true
+    SimulationServiceInConnector		= true
 
 [AssetService]
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
@@ -68,10 +70,10 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
+
     ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -83,15 +85,16 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [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:XInventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
+	UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService				= "OpenSim.Services.GridService.dll:GridService"
+    AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
     
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -106,7 +109,7 @@
 [UserAgentService]
 	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
 	;; for the service
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
 	
 ;; The interface that local users get when they are in other grids
-- 
cgit v1.1