aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-12 14:40:21 -0800
committerJohn Hurliman2010-03-12 14:40:21 -0800
commit5beb08be3153575312b35401da95b7e8810c94df (patch)
tree03f9ebd4d6a4af160a4b3e320be49d0e0577dce3 /bin
parentMinor tweak to clean up SimianGrid asset service URLs (diff)
parentrefactor: move client invoked AttachObject from SceneGraph to AttachmentsModule (diff)
downloadopensim-SC_OLD-5beb08be3153575312b35401da95b7e8810c94df.zip
opensim-SC_OLD-5beb08be3153575312b35401da95b7e8810c94df.tar.gz
opensim-SC_OLD-5beb08be3153575312b35401da95b7e8810c94df.tar.bz2
opensim-SC_OLD-5beb08be3153575312b35401da95b7e8810c94df.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Standalone.ini40
1 files changed, 22 insertions, 18 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 54e11af..92c2154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
5;; 5;;
6 6
7[Modules] 7[Modules]
8 AssetServices = "LocalAssetServicesConnector" 8 AssetServices = "LocalAssetServicesConnector"
9 InventoryServices = "LocalInventoryServicesConnector" 9 InventoryServices = "LocalInventoryServicesConnector"
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 = "LocalSimulationConnectorModule" 15 GridUserServices = "LocalGridUserServicesConnector"
16 AvatarServices = "LocalAvatarServicesConnector" 16 SimulationServices = "LocalSimulationConnectorModule"
17 EntityTransferModule = "BasicEntityTransferModule" 17 AvatarServices = "LocalAvatarServicesConnector"
18 InventoryAccessModule = "BasicInventoryAccessModule" 18 EntityTransferModule = "BasicEntityTransferModule"
19 InventoryAccessModule = "BasicInventoryAccessModule"
19 LibraryModule = true 20 LibraryModule = true
20 LLLoginServiceInConnector = true 21 LLLoginServiceInConnector = true
21 22
@@ -57,6 +58,9 @@
57 GridService = "OpenSim.Services.GridService.dll:GridService" 58 GridService = "OpenSim.Services.GridService.dll:GridService"
58 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 59 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
59 60
61[GridUserService]
62 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
63
60[FriendsService] 64[FriendsService]
61 LocalServiceModule = "OpenSim.Services.FriendsService.dll" 65 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
62 66
@@ -64,14 +68,14 @@
64 Connector = "OpenSim.Services.FriendsService.dll" 68 Connector = "OpenSim.Services.FriendsService.dll"
65 69
66[LoginService] 70[LoginService]
67 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 71 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
68 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 72 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
69 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 73 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
70 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 74 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
71 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 75 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
72 GridService = "OpenSim.Services.GridService.dll:GridService" 76 GridService = "OpenSim.Services.GridService.dll:GridService"
73 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 77 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
74 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 78 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
75 79
76 WelcomeMessage = "Welcome, Avatar!" 80 WelcomeMessage = "Welcome, Avatar!"
77 81