diff options
author | Melanie | 2019-10-06 23:57:47 +0100 |
---|---|---|
committer | Melanie | 2019-10-06 23:57:47 +0100 |
commit | be34b8e79de25d5d30f2c22d2657cbe965693540 (patch) | |
tree | 7ddb1c856c2c3be2ea016a5ec2487ad5a4967883 /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Introduce a way to send the grid's message kay, if one is used (diff) | |
download | opensim-SC-be34b8e79de25d5d30f2c22d2657cbe965693540.zip opensim-SC-be34b8e79de25d5d30f2c22d2657cbe965693540.tar.gz opensim-SC-be34b8e79de25d5d30f2c22d2657cbe965693540.tar.bz2 opensim-SC-be34b8e79de25d5d30f2c22d2657cbe965693540.tar.xz |
Fix build break
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 1b652a0..8ad9df8 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -73,6 +73,7 @@ namespace OpenSim.Services.HypergridService | |||
73 | private static Uri m_Uri; | 73 | private static Uri m_Uri; |
74 | private static GridRegion m_DefaultGatewayRegion; | 74 | private static GridRegion m_DefaultGatewayRegion; |
75 | private bool m_allowDuplicatePresences = false; | 75 | private bool m_allowDuplicatePresences = false; |
76 | private static string m_messageKey; | ||
76 | 77 | ||
77 | public GatekeeperService(IConfigSource config, ISimulationService simService) | 78 | public GatekeeperService(IConfigSource config, ISimulationService simService) |
78 | { | 79 | { |
@@ -154,6 +155,9 @@ namespace OpenSim.Services.HypergridService | |||
154 | m_allowDuplicatePresences = presenceConfig.GetBoolean("AllowDuplicatePresences", m_allowDuplicatePresences); | 155 | m_allowDuplicatePresences = presenceConfig.GetBoolean("AllowDuplicatePresences", m_allowDuplicatePresences); |
155 | } | 156 | } |
156 | 157 | ||
158 | IConfig messagingConfig = config.Configs["Messaging"]; | ||
159 | if (messagingConfig != null) | ||
160 | m_messageKey = messagingConfig.GetString("MessageKey", String.Empty); | ||
157 | m_log.Debug("[GATEKEEPER SERVICE]: Starting..."); | 161 | m_log.Debug("[GATEKEEPER SERVICE]: Starting..."); |
158 | } | 162 | } |
159 | } | 163 | } |
@@ -651,7 +655,7 @@ namespace OpenSim.Services.HypergridService | |||
651 | msg.Position = Vector3.Zero; | 655 | msg.Position = Vector3.Zero; |
652 | msg.RegionID = scopeID.Guid; | 656 | msg.RegionID = scopeID.Guid; |
653 | msg.binaryBucket = new byte[1] {0}; | 657 | msg.binaryBucket = new byte[1] {0}; |
654 | InstantMessageServiceConnector.SendInstantMessage(regURL,msg); | 658 | InstantMessageServiceConnector.SendInstantMessage(regURL,msg, m_messageKey); |
655 | 659 | ||
656 | m_GridUserService.LoggedOut(agentID.ToString(), | 660 | m_GridUserService.LoggedOut(agentID.ToString(), |
657 | UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); | 661 | UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); |