diff options
author | Melanie | 2019-10-06 23:24:41 +0100 |
---|---|---|
committer | Melanie | 2019-10-06 23:24:41 +0100 |
commit | eb55f7f2bc3afb2477974e5417e48b8f8ee6cc65 (patch) | |
tree | 35d8479fd9142e441fb436b20ecce10877f0ace7 /OpenSim/Services/HypergridService | |
parent | Remove a no longer used property that used ScopeID in an improper way (diff) | |
download | opensim-SC-eb55f7f2bc3afb2477974e5417e48b8f8ee6cc65.zip opensim-SC-eb55f7f2bc3afb2477974e5417e48b8f8ee6cc65.tar.gz opensim-SC-eb55f7f2bc3afb2477974e5417e48b8f8ee6cc65.tar.bz2 opensim-SC-eb55f7f2bc3afb2477974e5417e48b8f8ee6cc65.tar.xz |
Introduce a way to send the grid's message kay, if one is used
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index d1739cf..09c5354 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -118,6 +118,7 @@ namespace OpenSim.Services.HypergridService | |||
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | 120 | ||
121 | m_messageKey = cnf.GetString("MessageKey", String.Empty); | ||
121 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", false); | 122 | m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", false); |
122 | 123 | ||
123 | if (m_InGatekeeper) | 124 | if (m_InGatekeeper) |
@@ -282,7 +283,7 @@ namespace OpenSim.Services.HypergridService | |||
282 | 283 | ||
283 | if (reginfo != null) | 284 | if (reginfo != null) |
284 | { | 285 | { |
285 | imresult = InstantMessageServiceConnector.SendInstantMessage(reginfo.ServerURI, im); | 286 | imresult = InstantMessageServiceConnector.SendInstantMessage(reginfo.ServerURI, im, m_messageKey); |
286 | } | 287 | } |
287 | else | 288 | else |
288 | { | 289 | { |
@@ -373,4 +374,4 @@ namespace OpenSim.Services.HypergridService | |||
373 | return m_OfflineIMService.StoreMessage(im, out reason); | 374 | return m_OfflineIMService.StoreMessage(im, out reason); |
374 | } | 375 | } |
375 | } | 376 | } |
376 | } \ No newline at end of file | 377 | } |