aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorCinder2015-06-12 18:48:07 -0600
committerDiva Canto2015-06-13 07:27:42 -0700
commit0fa94f222df8ed7f308730c3692bf2a774138718 (patch)
tree560efc5542dea946a79dbbaebd39b991a67ede73 /bin
parentRelicense AgentPreferences files to BSD and OpenSimulator (diff)
downloadopensim-SC_OLD-0fa94f222df8ed7f308730c3692bf2a774138718.zip
opensim-SC_OLD-0fa94f222df8ed7f308730c3692bf2a774138718.tar.gz
opensim-SC_OLD-0fa94f222df8ed7f308730c3692bf2a774138718.tar.bz2
opensim-SC_OLD-0fa94f222df8ed7f308730c3692bf2a774138718.tar.xz
Refactor AgentPreferences so that database operations happen centrally. the opensim way.
Signed-off-by: Diva Canto <diva@metaverseink.com>
Diffstat (limited to 'bin')
-rw-r--r--bin/Robust.HG.ini.example6
-rw-r--r--bin/Robust.ini.example6
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridCommon.ini.example6
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/Standalone.ini1
-rw-r--r--bin/config-include/StandaloneHypergrid.ini1
7 files changed, 22 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 8962afa..18fe894 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -85,6 +85,7 @@
85 PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector" 85 PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
86 UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector" 86 UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
87 GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector" 87 GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
88 AgentPreferencesServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AgentPreferencesServiceConnector"
88 FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector" 89 FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
89 MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector" 90 MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
90 MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector" 91 MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
@@ -374,6 +375,11 @@
374 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 375 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
375 376
376 377
378[AgentPreferencesService]
379 ; for the server connector
380 LocalServiceModule = "Opensim.Services.UserAccountService.dll:AgentPreferencesService"
381
382
377[PresenceService] 383[PresenceService]
378 ; for the server connector 384 ; for the server connector
379 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 385 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 48deeae..60f07fc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -76,6 +76,7 @@
76 PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector" 76 PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
77 UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector" 77 UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
78 GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector" 78 GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
79 AgentPreferencesServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AgentPreferencesServiceConnector"
79 FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector" 80 FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
80 MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector" 81 MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
81 MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector" 82 MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
@@ -332,6 +333,11 @@
332 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 333 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
333 334
334 335
336[AgentPreferencesService]
337 ; for the server connector
338 LocalServiceModule = "Opensim.Services.UserAccountService.dll:AgentPreferencesService"
339
340
335[PresenceService] 341[PresenceService]
336 ; for the server connector 342 ; for the server connector
337 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 343 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4b01d82..3c61ee0 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -17,6 +17,7 @@
17 AuthorizationServices = "LocalAuthorizationServicesConnector" 17 AuthorizationServices = "LocalAuthorizationServicesConnector"
18 PresenceServices = "RemotePresenceServicesConnector" 18 PresenceServices = "RemotePresenceServicesConnector"
19 UserAccountServices = "RemoteUserAccountServicesConnector" 19 UserAccountServices = "RemoteUserAccountServicesConnector"
20 AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
20 GridUserServices = "RemoteGridUserServicesConnector" 21 GridUserServices = "RemoteGridUserServicesConnector"
21 SimulationServices = "RemoteSimulationConnectorModule" 22 SimulationServices = "RemoteSimulationConnectorModule"
22 EntityTransferModule = "BasicEntityTransferModule" 23 EntityTransferModule = "BasicEntityTransferModule"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4486f31..0922cf5 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -131,6 +131,12 @@
131 ; 131 ;
132 AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}" 132 AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
133 133
134[AgentPreferencesService]
135 ;
136 ; Change this to your grid-wide avatar prefs server
137 ;
138 AgentPreferencesServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
139
134[PresenceService] 140[PresenceService]
135 ; 141 ;
136 ; Change this to your grid-wide presence server 142 ; Change this to your grid-wide presence server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 21a5a22..aa64c2a 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -20,6 +20,7 @@
20 AuthorizationServices = "LocalAuthorizationServicesConnector" 20 AuthorizationServices = "LocalAuthorizationServicesConnector"
21 PresenceServices = "RemotePresenceServicesConnector" 21 PresenceServices = "RemotePresenceServicesConnector"
22 UserAccountServices = "RemoteUserAccountServicesConnector" 22 UserAccountServices = "RemoteUserAccountServicesConnector"
23 AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
23 GridUserServices = "RemoteGridUserServicesConnector" 24 GridUserServices = "RemoteGridUserServicesConnector"
24 SimulationServices = "RemoteSimulationConnectorModule" 25 SimulationServices = "RemoteSimulationConnectorModule"
25 EntityTransferModule = "HGEntityTransferModule" 26 EntityTransferModule = "HGEntityTransferModule"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6b91d9a..93a5437 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -14,6 +14,7 @@
14 PresenceServices = "LocalPresenceServicesConnector" 14 PresenceServices = "LocalPresenceServicesConnector"
15 UserProfilesServices = "LocalUserProfilesServicesConnector" 15 UserProfilesServices = "LocalUserProfilesServicesConnector"
16 UserAccountServices = "LocalUserAccountServicesConnector" 16 UserAccountServices = "LocalUserAccountServicesConnector"
17 AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
17 GridUserServices = "LocalGridUserServicesConnector" 18 GridUserServices = "LocalGridUserServicesConnector"
18 SimulationServices = "LocalSimulationConnectorModule" 19 SimulationServices = "LocalSimulationConnectorModule"
19 AvatarServices = "LocalAvatarServicesConnector" 20 AvatarServices = "LocalAvatarServicesConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1be67db..43cb145 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -16,6 +16,7 @@
16 GridServices = "LocalGridServicesConnector" 16 GridServices = "LocalGridServicesConnector"
17 PresenceServices = "LocalPresenceServicesConnector" 17 PresenceServices = "LocalPresenceServicesConnector"
18 UserAccountServices = "LocalUserAccountServicesConnector" 18 UserAccountServices = "LocalUserAccountServicesConnector"
19 AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
19 GridUserServices = "LocalGridUserServicesConnector" 20 GridUserServices = "LocalGridUserServicesConnector"
20 SimulationServices = "RemoteSimulationConnectorModule" 21 SimulationServices = "RemoteSimulationConnectorModule"
21 AvatarServices = "LocalAvatarServicesConnector" 22 AvatarServices = "LocalAvatarServicesConnector"