Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor

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 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
+
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -67,6 +70,7 @@
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
 
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 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
@@ -87,16 +89,18 @@
     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"
-        ;; for the service
+    ;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
-    ; how does the outside world reach me? This acts as public key too.
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    WelcomeMessage = "Welcome, Avatar!"
 
 [UserAgentService]
         LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"