aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorMelanie2019-10-06 23:57:47 +0100
committerMelanie2019-10-06 23:57:47 +0100
commitbe34b8e79de25d5d30f2c22d2657cbe965693540 (patch)
tree7ddb1c856c2c3be2ea016a5ec2487ad5a4967883 /OpenSim/Services/LLLoginService
parentIntroduce a way to send the grid's message kay, if one is used (diff)
downloadopensim-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/LLLoginService')
-rwxr-xr-xOpenSim/Services/LLLoginService/LLLoginService.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 22cdff5..9b8ea37 100755
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -92,6 +92,7 @@ namespace OpenSim.Services.LLLoginService
92 protected string m_MessageUrl; 92 protected string m_MessageUrl;
93 protected string m_DSTZone; 93 protected string m_DSTZone;
94 protected bool m_allowDuplicatePresences = false; 94 protected bool m_allowDuplicatePresences = false;
95 protected string m_messageKey;
95 96
96 IConfig m_LoginServerConfig; 97 IConfig m_LoginServerConfig;
97// IConfig m_ClientsConfig; 98// IConfig m_ClientsConfig;
@@ -159,6 +160,9 @@ namespace OpenSim.Services.LLLoginService
159 m_MapTileURL = m_MapTileURL + "/"; 160 m_MapTileURL = m_MapTileURL + "/";
160 } 161 }
161 162
163 IConfig messagingConfig = config.Configs["Messaging"];
164 if (messagingConfig != null)
165 m_messageKey = messagingConfig.GetString("MessageKey", String.Empty);
162 // These are required; the others aren't 166 // These are required; the others aren't
163 if (accountService == string.Empty || authService == string.Empty) 167 if (accountService == string.Empty || authService == string.Empty)
164 throw new Exception("LoginService is missing service specifications"); 168 throw new Exception("LoginService is missing service specifications");
@@ -1170,7 +1174,7 @@ namespace OpenSim.Services.LLLoginService
1170 msg.Position = Vector3.Zero; 1174 msg.Position = Vector3.Zero;
1171 msg.RegionID = scopeID.Guid; 1175 msg.RegionID = scopeID.Guid;
1172 msg.binaryBucket = new byte[1] {0}; 1176 msg.binaryBucket = new byte[1] {0};
1173 InstantMessageServiceConnector.SendInstantMessage(regURL,msg); 1177 InstantMessageServiceConnector.SendInstantMessage(regURL,msg, m_messageKey);
1174 1178
1175 m_GridUserService.LoggedOut(agentID.ToString(), 1179 m_GridUserService.LoggedOut(agentID.ToString(),
1176 UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); 1180 UUID.Zero, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt);