aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-02-25 23:34:58 +0000
committerMelanie2010-02-25 23:34:58 +0000
commit12432b175142b4e8cf5900913da82f5e64ef6895 (patch)
tree6313ce198128a796367289f795578cc2e7999212 /bin/config-include
parentImplement local online/offline notifications (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC_OLD-12432b175142b4e8cf5900913da82f5e64ef6895.zip
opensim-SC_OLD-12432b175142b4e8cf5900913da82f5e64ef6895.tar.gz
opensim-SC_OLD-12432b175142b4e8cf5900913da82f5e64ef6895.tar.bz2
opensim-SC_OLD-12432b175142b4e8cf5900913da82f5e64ef6895.tar.xz
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Standalone.ini4
-rw-r--r--bin/config-include/StandaloneHypergrid.ini10
2 files changed, 11 insertions, 3 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 06333d8..ce77b3f 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -59,6 +59,9 @@
59 GridService = "OpenSim.Services.GridService.dll:GridService" 59 GridService = "OpenSim.Services.GridService.dll:GridService"
60 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 60 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
61 61
62[Friends]
63 Connector = "OpenSim.Services.FriendsService.dll"
64
62[LoginService] 65[LoginService]
63 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 66 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
64 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 67 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -67,6 +70,7 @@
67 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 70 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
68 GridService = "OpenSim.Services.GridService.dll:GridService" 71 GridService = "OpenSim.Services.GridService.dll:GridService"
69 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 72 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
73 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
70 74
71 WelcomeMessage = "Welcome, Avatar!" 75 WelcomeMessage = "Welcome, Avatar!"
72 76
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 04a2356..ecdd6f7 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,8 @@
77 GridService = "OpenSim.Services.GridService.dll:GridService" 77 GridService = "OpenSim.Services.GridService.dll:GridService"
78 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 78 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
79 79
80[Friends]
81 Connector = "OpenSim.Services.FriendsService.dll"
80 82
81[LoginService] 83[LoginService]
82 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 84 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
@@ -87,16 +89,18 @@
87 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 89 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
88 GridService = "OpenSim.Services.GridService.dll:GridService" 90 GridService = "OpenSim.Services.GridService.dll:GridService"
89 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 91 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
92 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
90 93
91[GatekeeperService] 94[GatekeeperService]
92 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 95 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
93 ;; for the service 96 ;; for the service
94 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 97 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
95 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 98 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
96 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 99 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
97 GridService = "OpenSim.Services.GridService.dll:GridService" 100 GridService = "OpenSim.Services.GridService.dll:GridService"
98 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" 101 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
99 ; how does the outside world reach me? This acts as public key too. 102 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
103 WelcomeMessage = "Welcome, Avatar!"
100 104
101[UserAgentService] 105[UserAgentService]
102 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 106 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"