OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build break

0.9.1.0-post-fixes
Melanie 2019-10-06 23:57:47 +01:00
parent eb55f7f2bc
commit be34b8e79d
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -73,6 +73,7 @@ namespace OpenSim.Services.HypergridService
private static Uri m_Uri; private static Uri m_Uri;
private static GridRegion m_DefaultGatewayRegion; private static GridRegion m_DefaultGatewayRegion;
private bool m_allowDuplicatePresences = false; private bool m_allowDuplicatePresences = false;
private static string m_messageKey;
public GatekeeperService(IConfigSource config, ISimulationService simService) public GatekeeperService(IConfigSource config, ISimulationService simService)
{ {
@ -154,6 +155,9 @@ namespace OpenSim.Services.HypergridService
m_allowDuplicatePresences = presenceConfig.GetBoolean("AllowDuplicatePresences", m_allowDuplicatePresences); m_allowDuplicatePresences = presenceConfig.GetBoolean("AllowDuplicatePresences", m_allowDuplicatePresences);
} }
IConfig messagingConfig = config.Configs["Messaging"];
if (messagingConfig != null)
m_messageKey = messagingConfig.GetString("MessageKey", String.Empty);
m_log.Debug("[GATEKEEPER SERVICE]: Starting..."); m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
} }
} }
@ -651,7 +655,7 @@ namespace OpenSim.Services.HypergridService
msg.Position = Vector3.Zero; msg.Position = Vector3.Zero;
msg.RegionID = scopeID.Guid; msg.RegionID = scopeID.Guid;
msg.binaryBucket = new byte[1] {0}; msg.binaryBucket = new byte[1] {0};
InstantMessageServiceConnector.SendInstantMessage(regURL,msg); InstantMessageServiceConnector.SendInstantMessage(regURL,msg, m_messageKey);
m_GridUserService.LoggedOut(agentID.ToString(), m_GridUserService.LoggedOut(agentID.ToString(),
UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt);

3
OpenSim/Services/HypergridService/HGInstantMessageService.cs
View File

@ -70,6 +70,7 @@ namespace OpenSim.Services.HypergridService
private static bool m_ForwardOfflineGroupMessages; private static bool m_ForwardOfflineGroupMessages;
private static bool m_InGatekeeper; private static bool m_InGatekeeper;
private string m_messageKey;
public HGInstantMessageService(IConfigSource config) public HGInstantMessageService(IConfigSource config)
: this(config, null) : this(config, null)
@ -322,7 +323,7 @@ namespace OpenSim.Services.HypergridService
bool ForwardIMToGrid(string url, GridInstantMessage im, UUID toAgentID, bool foreigner) bool ForwardIMToGrid(string url, GridInstantMessage im, UUID toAgentID, bool foreigner)
{ {
if (InstantMessageServiceConnector.SendInstantMessage(url, im)) if (InstantMessageServiceConnector.SendInstantMessage(url, im, m_messageKey))
{ {
// IM delivery successful, so store the Agent's location in our local cache. // IM delivery successful, so store the Agent's location in our local cache.
lock (m_UserLocationMap) lock (m_UserLocationMap)

6
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -92,6 +92,7 @@ namespace OpenSim.Services.LLLoginService
protected string m_MessageUrl; protected string m_MessageUrl;
protected string m_DSTZone; protected string m_DSTZone;
protected bool m_allowDuplicatePresences = false; protected bool m_allowDuplicatePresences = false;
protected string m_messageKey;
IConfig m_LoginServerConfig; IConfig m_LoginServerConfig;
// IConfig m_ClientsConfig; // IConfig m_ClientsConfig;
@ -159,6 +160,9 @@ namespace OpenSim.Services.LLLoginService
m_MapTileURL = m_MapTileURL + "/"; m_MapTileURL = m_MapTileURL + "/";
} }
IConfig messagingConfig = config.Configs["Messaging"];
if (messagingConfig != null)
m_messageKey = messagingConfig.GetString("MessageKey", String.Empty);
// These are required; the others aren't // These are required; the others aren't
if (accountService == string.Empty || authService == string.Empty) if (accountService == string.Empty || authService == string.Empty)
throw new Exception("LoginService is missing service specifications"); throw new Exception("LoginService is missing service specifications");
@ -1170,7 +1174,7 @@ namespace OpenSim.Services.LLLoginService
msg.Position = Vector3.Zero; msg.Position = Vector3.Zero;
msg.RegionID = scopeID.Guid; msg.RegionID = scopeID.Guid;
msg.binaryBucket = new byte[1] {0}; msg.binaryBucket = new byte[1] {0};
InstantMessageServiceConnector.SendInstantMessage(regURL,msg); InstantMessageServiceConnector.SendInstantMessage(regURL,msg, m_messageKey);
m_GridUserService.LoggedOut(agentID.ToString(), m_GridUserService.LoggedOut(agentID.ToString(),
UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt);

2
OpenSim/Tests/Robust/Clients/InstantMessage/IMClient.cs
View File

@ -50,7 +50,7 @@ namespace Robust.Tests
im.message = "Hello"; im.message = "Hello";
im.imSessionID = new Guid(); im.imSessionID = new Guid();
bool success = InstantMessageServiceConnector.SendInstantMessage(DemonServer.Address, im); bool success = InstantMessageServiceConnector.SendInstantMessage(DemonServer.Address, im, String.Empty);
Assert.IsFalse(success, "Sending of IM succeeded, but it should have failed"); Assert.IsFalse(success, "Sending of IM succeeded, but it should have failed");
} }