Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 31 insertions, 1 deletions

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 486f22e..719df5c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -18,8 +18,10 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
+        MapImageService                 = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
+    FriendsModule                       = "HGFriendsModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -30,6 +32,14 @@
         GridInfoServiceInConnector                      = true
     AuthenticationServiceInConnector    = true
     SimulationServiceInConnector                = true
+        MapImageServiceInConnector                      = true
+
+[Profile]
+    Module = "BasicProfileModule"
+
+[Messaging]
+    MessageTransferModule = HGMessageTransferModule
+    LureModule = HGLureModule
 
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -108,7 +118,12 @@
     GridService                         = "OpenSim.Services.GridService.dll:GridService"
     AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
-    
+   
+[MapImageService]
+        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+        ; in minutes
+        RefreshTime = 60
+
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
@@ -125,6 +140,9 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
         
 ;; The interface that local users get when they are in other grids
@@ -140,6 +158,18 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+[HGFriendsService]
+        LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+
+[HGInstantMessageService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+        GridService = "OpenSim.Services.GridService.dll:GridService"
+        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        InGatekeeper = True
+
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"