aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-05-07 21:29:56 -0700
committerDiva Canto2010-05-07 21:29:56 -0700
commita58859a0d4206c194c9c56212218e2cafc2cc373 (patch)
treefed51a4e40c344b76f6b8b4d5c5b2ec0d2e142e4 /bin
parentimprove handling of undersize sculpt textures (diff)
downloadopensim-SC_OLD-a58859a0d4206c194c9c56212218e2cafc2cc373.zip
opensim-SC_OLD-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.gz
opensim-SC_OLD-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.bz2
opensim-SC_OLD-a58859a0d4206c194c9c56212218e2cafc2cc373.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example9
-rw-r--r--bin/Robust.ini.example7
-rw-r--r--bin/config-include/Grid.ini33
-rw-r--r--bin/config-include/GridCommon.ini.example6
-rw-r--r--bin/config-include/GridHypergrid.ini34
-rw-r--r--bin/config-include/Standalone.ini8
-rw-r--r--bin/config-include/StandaloneHypergrid.ini65
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini3
8 files changed, 97 insertions, 68 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d8145af..9af1e4c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -11,7 +11,7 @@
11;; 11;;
12 12
13[Startup] 13[Startup]
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryServiceInConnector,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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryServiceInConnector,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,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
15 15
16; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above 17; * server instance, if none if specified above
@@ -93,6 +93,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
93 GridService = "OpenSim.Services.GridService.dll:GridService" 93 GridService = "OpenSim.Services.GridService.dll:GridService"
94 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 94 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
95 95
96[GridUserService]
97 ; for the server connector
98 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
99
96[PresenceService] 100[PresenceService]
97 ; for the server connector 101 ; for the server connector
98 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 102 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -114,6 +118,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
114 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 118 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
115 ; for the service 119 ; for the service
116 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 120 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
121 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
117 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 122 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
118 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 123 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
119 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 124 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -196,7 +201,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
196[UserAgentService] 201[UserAgentService]
197 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 202 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
198 ;; for the service 203 ;; for the service
199 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 204 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
200 GridService = "OpenSim.Services.GridService.dll:GridService" 205 GridService = "OpenSim.Services.GridService.dll:GridService"
201 206
202;; The interface that local users get when they are in other grids. 207;; The interface that local users get when they are in other grids.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index ae3a53c..502a8e6 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -11,7 +11,7 @@
11; * 11; *
12[Startup] 12[Startup]
13 13
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,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,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,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,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
15 15
16; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above 17; * server instance, if none if specified above
@@ -95,6 +95,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
95 GridService = "OpenSim.Services.GridService.dll:GridService" 95 GridService = "OpenSim.Services.GridService.dll:GridService"
96 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 96 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
97 97
98[GridUserService]
99 ; for the server connector
100 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
101
98[PresenceService] 102[PresenceService]
99 ; for the server connector 103 ; for the server connector
100 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 104 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -116,6 +120,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
116 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 120 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
117 ; for the service 121 ; for the service
118 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 122 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
123 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
119 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 124 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
120 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 125 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
121 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 126 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4767cbc..9a75f19 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,21 +8,24 @@
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Modules] 10[Modules]
11 AssetServices = "RemoteAssetServicesConnector" 11 AssetServices = "RemoteAssetServicesConnector"
12 InventoryServices = "RemoteXInventoryServicesConnector" 12 InventoryServices = "RemoteXInventoryServicesConnector"
13 GridServices = "RemoteGridServicesConnector" 13 GridServices = "RemoteGridServicesConnector"
14 AvatarServices = "RemoteAvatarServicesConnector" 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
16 AuthenticationServices = "RemoteAuthenticationServicesConnector" 16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
17 PresenceServices = "RemotePresenceServicesConnector" 17 AuthorizationServices = "RemoteAuthorizationServicesConnector"
18 UserAccountServices = "RemoteUserAccountServicesConnector" 18 PresenceServices = "RemotePresenceServicesConnector"
19 SimulationServices = "RemoteSimulationConnectorModule" 19 UserAccountServices = "RemoteUserAccountServicesConnector"
20 EntityTransferModule = "BasicEntityTransferModule" 20 GridUserServices = "RemoteGridUserServicesConnector"
21 InventoryAccessModule = "BasicInventoryAccessModule" 21 SimulationServices = "RemoteSimulationConnectorModule"
22 LandServiceInConnector = true 22 EntityTransferModule = "BasicEntityTransferModule"
23 NeighbourServiceInConnector = true 23 InventoryAccessModule = "BasicInventoryAccessModule"
24 SimulationServiceInConnector = true 24
25 LibraryModule = true 25 LandServiceInConnector = true
26 NeighbourServiceInConnector = true
27 SimulationServiceInConnector = true
28 LibraryModule = true
26 29
27 30
28[GridService] 31[GridService]
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6e27694..88ac5e2 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,6 +40,12 @@
40 ; 40 ;
41 UserAccountServerURI = "http://mygridserver.com:8003" 41 UserAccountServerURI = "http://mygridserver.com:8003"
42 42
43[GridUserService]
44 ;
45 ; change this to your grid-wide user accounts server
46 ;
47 GridUserServerURI = "http://mygridserver.com:8003"
48
43[AuthenticationService] 49[AuthenticationService]
44 ; 50 ;
45 ; change this to your grid-wide authentication server 51 ; change this to your grid-wide authentication server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1e24f88..1adc2d8 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,22 +8,24 @@
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Modules] 10[Modules]
11 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker" 12 InventoryServices = "HGInventoryBroker"
13 GridServices = "RemoteGridServicesConnector" 13 GridServices = "RemoteGridServicesConnector"
14 AvatarServices = "RemoteAvatarServicesConnector" 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
16 AuthenticationServices = "RemoteAuthenticationServicesConnector" 16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
17 AuthorizationServices = "LocalAuthorizationServicesConnector" 17 AuthorizationServices = "RemoteAuthorizationServicesConnector"
18 PresenceServices = "RemotePresenceServicesConnector" 18 PresenceServices = "RemotePresenceServicesConnector"
19 UserAccountServices = "RemoteUserAccountServicesConnector" 19 UserAccountServices = "RemoteUserAccountServicesConnector"
20 SimulationServices = "RemoteSimulationConnectorModule" 20 GridUserServices = "RemoteGridUserServicesConnector"
21 EntityTransferModule = "HGEntityTransferModule" 21 SimulationServices = "RemoteSimulationConnectorModule"
22 InventoryAccessModule = "HGInventoryAccessModule" 22 EntityTransferModule = "HGEntityTransferModule"
23 LandServiceInConnector = true 23 InventoryAccessModule = "HGInventoryAccessModule"
24 NeighbourServiceInConnector = true 24
25 SimulationServiceInConnector = true 25 LandServiceInConnector = true
26 LibraryModule = true 26 NeighbourServiceInConnector = true
27 SimulationServiceInConnector = true
28 LibraryModule = true
27 29
28[AssetService] 30[AssetService]
29 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 31 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 027b4ea..6b7dc50 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,8 +17,9 @@
17 AvatarServices = "LocalAvatarServicesConnector" 17 AvatarServices = "LocalAvatarServicesConnector"
18 EntityTransferModule = "BasicEntityTransferModule" 18 EntityTransferModule = "BasicEntityTransferModule"
19 InventoryAccessModule = "BasicInventoryAccessModule" 19 InventoryAccessModule = "BasicInventoryAccessModule"
20 LibraryModule = true 20
21 LLLoginServiceInConnector = true 21 LibraryModule = true
22 LLLoginServiceInConnector = true
22 23
23[AssetService] 24[AssetService]
24 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 25 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -54,7 +55,7 @@
54 55
55 ;; These are for creating new accounts 56 ;; These are for creating new accounts
56 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 57 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
57 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 58 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
58 GridService = "OpenSim.Services.GridService.dll:GridService" 59 GridService = "OpenSim.Services.GridService.dll:GridService"
59 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 60 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
60 61
@@ -70,6 +71,7 @@
70[LoginService] 71[LoginService]
71 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 72 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
72 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 73 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
74 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 75 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 76 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 77 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
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 @@
5;; 5;;
6 6
7[Modules] 7[Modules]
8 AssetServices = "HGAssetBroker" 8 AssetServices = "HGAssetBroker"
9 InventoryServices = "HGInventoryBroker" 9 InventoryServices = "HGInventoryBroker"
10 NeighbourServices = "LocalNeighbourServicesConnector" 10 NeighbourServices = "LocalNeighbourServicesConnector"
11 AuthenticationServices = "LocalAuthenticationServicesConnector" 11 AuthenticationServices = "LocalAuthenticationServicesConnector"
12 GridServices = "LocalGridServicesConnector" 12 GridServices = "LocalGridServicesConnector"
13 PresenceServices = "LocalPresenceServicesConnector" 13 PresenceServices = "LocalPresenceServicesConnector"
14 UserAccountServices = "LocalUserAccountServicesConnector" 14 UserAccountServices = "LocalUserAccountServicesConnector"
15 SimulationServices = "RemoteSimulationConnectorModule" 15 GridUserServices = "LocalGridUserServicesConnector"
16 AvatarServices = "LocalAvatarServicesConnector" 16 SimulationServices = "RemoteSimulationConnectorModule"
17 EntityTransferModule = "HGEntityTransferModule" 17 AvatarServices = "LocalAvatarServicesConnector"
18 InventoryAccessModule = "HGInventoryAccessModule" 18 EntityTransferModule = "HGEntityTransferModule"
19 InventoryServiceInConnector = true 19 InventoryAccessModule = "HGInventoryAccessModule"
20 AssetServiceInConnector = true 20
21 HypergridServiceInConnector = true 21 InventoryServiceInConnector = true
22 NeighbourServiceInConnector = true 22 AssetServiceInConnector = true
23 LibraryModule = true 23 HypergridServiceInConnector = true
24 LLLoginServiceInConnector = true 24 NeighbourServiceInConnector = true
25 AuthenticationServiceInConnector = true 25 LibraryModule = true
26 SimulationServiceInConnector = true 26 LLLoginServiceInConnector = true
27 AuthenticationServiceInConnector = true
28 SimulationServiceInConnector = true
27 29
28[AssetService] 30[AssetService]
29 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 31 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -68,10 +70,10 @@
68 70
69[UserAccountService] 71[UserAccountService]
70 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 72 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
71 ConnectionString = "URI=file:userprofiles.db,version=3" 73
72 ;; These are for creating new accounts by the service 74 ;; These are for creating new accounts by the service
73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 75 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 76 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
75 GridService = "OpenSim.Services.GridService.dll:GridService" 77 GridService = "OpenSim.Services.GridService.dll:GridService"
76 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 78 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
77 79
@@ -83,15 +85,16 @@
83 Connector = "OpenSim.Services.FriendsService.dll" 85 Connector = "OpenSim.Services.FriendsService.dll"
84 86
85[LoginService] 87[LoginService]
86 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 88 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
87 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 89 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
88 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 90 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
89 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 91 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
90 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 92 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
91 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 93 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
92 GridService = "OpenSim.Services.GridService.dll:GridService" 94 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
93 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 95 GridService = "OpenSim.Services.GridService.dll:GridService"
94 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 96 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
97 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
95 98
96[GatekeeperService] 99[GatekeeperService]
97 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 100 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -106,7 +109,7 @@
106[UserAgentService] 109[UserAgentService]
107 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 110 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
108 ;; for the service 111 ;; for the service
109 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 112 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
110 GridService = "OpenSim.Services.GridService.dll:GridService" 113 GridService = "OpenSim.Services.GridService.dll:GridService"
111 114
112;; The interface that local users get when they are in other grids 115;; The interface that local users get when they are in other grids
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index ed88a8a..fe814d7 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -17,6 +17,9 @@
17[UserAccountService] 17[UserAccountService]
18 ConnectionString = "URI=file:userprofiles.db,version=3" 18 ConnectionString = "URI=file:userprofiles.db,version=3"
19 19
20[GridUserService]
21 ConnectionString = "URI=file:griduser.db,version=3"
22
20[FriendsService] 23[FriendsService]
21 ConnectionString = "URI=file:friends.db,version=3" 24 ConnectionString = "URI=file:friends.db,version=3"
22 25