aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2011-05-26 10:04:48 -0700
committerDiva Canto2011-05-26 10:04:48 -0700
commit0c58a9e68074f3593920dc9f2356bbed96416497 (patch)
tree6bccb313c233ab6486195e8a3663cfa1d30c41b9 /bin
parentHG: Renamed, shuffled some interfaces around. Move them all to IHypergridServ... (diff)
downloadopensim-SC_OLD-0c58a9e68074f3593920dc9f2356bbed96416497.zip
opensim-SC_OLD-0c58a9e68074f3593920dc9f2356bbed96416497.tar.gz
opensim-SC_OLD-0c58a9e68074f3593920dc9f2356bbed96416497.tar.bz2
opensim-SC_OLD-0c58a9e68074f3593920dc9f2356bbed96416497.tar.xz
HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example18
-rw-r--r--bin/config-include/GridCommon.ini.example6
-rw-r--r--bin/config-include/GridHypergrid.ini11
3 files changed, 33 insertions, 2 deletions
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 @@
21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>] 21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
22; * 22; *
23[Startup] 23[Startup]
24ServiceConnectors = "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" 24ServiceConnectors = "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"
25 25
26; * This is common for all services, it's the network setup for the entire 26; * This is common for all services, it's the network setup for the entire
27; * server instance, if none is specified above 27; * server instance, if none is specified above
@@ -316,7 +316,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
316 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" 316 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
317 GridService = "OpenSim.Services.GridService.dll:GridService" 317 GridService = "OpenSim.Services.GridService.dll:GridService"
318 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" 318 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
319 319 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
320 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
321 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
322
320 ; If you run this user agent server behind a proxy, set this to true 323 ; If you run this user agent server behind a proxy, set this to true
321 ; HasProxy = false 324 ; HasProxy = false
322 325
@@ -344,3 +347,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
344 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService" 347 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
345 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 348 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
346 ProfileServerURI = "http://127.0.0.1:8002/user" 349 ProfileServerURI = "http://127.0.0.1:8002/user"
350
351[HGFriendsService]
352 LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
353 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
354
355[HGInstantMessageService]
356 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
357 GridService = "OpenSim.Services.GridService.dll:GridService"
358 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
359 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
360
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 @@
93 ;; uncomment the next line. You may want to do this on sims that have licensed content. 93 ;; uncomment the next line. You may want to do this on sims that have licensed content.
94 ; OutboundPermission = False 94 ; OutboundPermission = False
95 95
96[UserAgentService]
97 ;
98 ; === HG ONLY ===
99 ; Change this to your user agent server
100 ;
101 UserAgentServerURI = "http://mygridserver.com:8002"
96 102
97[Modules] 103[Modules]
98 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 104 ;; 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 @@
24 EntityTransferModule = "HGEntityTransferModule" 24 EntityTransferModule = "HGEntityTransferModule"
25 InventoryAccessModule = "HGInventoryAccessModule" 25 InventoryAccessModule = "HGInventoryAccessModule"
26 LandServices = "RemoteLandServicesConnector" 26 LandServices = "RemoteLandServicesConnector"
27 FriendsModule = "HGFriendsModule"
27 28
28 LandServiceInConnector = true 29 LandServiceInConnector = true
29 NeighbourServiceInConnector = true 30 NeighbourServiceInConnector = true
30 SimulationServiceInConnector = true 31 SimulationServiceInConnector = true
31 LibraryModule = true 32 LibraryModule = true
32 33
34
33[SimulationDataStore] 35[SimulationDataStore]
34 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 36 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
35 37
@@ -63,3 +65,12 @@
63 65
64[Friends] 66[Friends]
65 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" 67 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
68
69[Messaging]
70 MessageTransferModule = HGMessageTransferModule
71
72[HGInstantMessageService]
73 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
74 GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
75 PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
76 UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" \ No newline at end of file