From 0c58a9e68074f3593920dc9f2356bbed96416497 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 26 May 2011 10:04:48 -0700
Subject: HG IM in grid mode working fairly well. Unknown target user
references looked back in source user's User Agent service.
---
bin/Robust.HG.ini.example | 18 ++++++++++++++++--
bin/config-include/GridCommon.ini.example | 6 ++++++
bin/config-include/GridHypergrid.ini | 11 +++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0d79e77..bfefe32 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
; *
[Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector,8002/OpenSim.Server.Handlers.dll:HGFriendsServerConnector,8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
; * This is common for all services, it's the network setup for the entire
; * server instance, if none is specified above
@@ -316,7 +316,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
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"
+
; If you run this user agent server behind a proxy, set this to true
; HasProxy = false
@@ -344,3 +347,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
ProfileServerURI = "http://127.0.0.1:8002/user"
+
+[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"
+
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index bc8bc0f..b2ecc79 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -93,6 +93,12 @@
;; uncomment the next line. You may want to do this on sims that have licensed content.
; OutboundPermission = False
+[UserAgentService]
+ ;
+ ; === HG ONLY ===
+ ; Change this to your user agent server
+ ;
+ UserAgentServerURI = "http://mygridserver.com:8002"
[Modules]
;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5142d90..d2cf898 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -24,12 +24,14 @@
EntityTransferModule = "HGEntityTransferModule"
InventoryAccessModule = "HGInventoryAccessModule"
LandServices = "RemoteLandServicesConnector"
+ FriendsModule = "HGFriendsModule"
LandServiceInConnector = true
NeighbourServiceInConnector = true
SimulationServiceInConnector = true
LibraryModule = true
+
[SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -63,3 +65,12 @@
[Friends]
Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
+
+[Messaging]
+ MessageTransferModule = HGMessageTransferModule
+
+[HGInstantMessageService]
+ LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+ GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+ PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+ UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
\ No newline at end of file
--
cgit v1.1