diff options
author | Drake Arconis | 2015-08-12 11:04:21 -0400 |
---|---|---|
committer | Diva Canto | 2015-08-12 09:08:01 -0700 |
commit | f25c67ea1dffafe190994609e434c05b8e628b1d (patch) | |
tree | 39ec7454d8fd07ccfb2ba114280861412bc94a86 | |
parent | Added *.Tests.log to .gitignore (diff) | |
download | opensim-SC_OLD-f25c67ea1dffafe190994609e434c05b8e628b1d.zip opensim-SC_OLD-f25c67ea1dffafe190994609e434c05b8e628b1d.tar.gz opensim-SC_OLD-f25c67ea1dffafe190994609e434c05b8e628b1d.tar.bz2 opensim-SC_OLD-f25c67ea1dffafe190994609e434c05b8e628b1d.tar.xz |
Send correct uuids in the FromID and ID packet fields for llInstantMessage
Signed-off-by: Diva Canto <diva@metaverseink.com>
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7521ea6..83f8e1b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3528,14 +3528,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3528 | 3528 | ||
3529 | // TODO: figure out values for client, fromSession, and imSessionID | 3529 | // TODO: figure out values for client, fromSession, and imSessionID |
3530 | // client.SendInstantMessage(m_host.UUID, fromSession, message, user, imSessionID, m_host.Name, AgentManager.InstantMessageDialog.MessageFromAgent, (uint)Util.UnixTimeSinceEpoch()); | 3530 | // client.SendInstantMessage(m_host.UUID, fromSession, message, user, imSessionID, m_host.Name, AgentManager.InstantMessageDialog.MessageFromAgent, (uint)Util.UnixTimeSinceEpoch()); |
3531 | UUID friendTransactionID = UUID.Random(); | ||
3532 | |||
3533 | //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); | ||
3534 | 3531 | ||
3535 | GridInstantMessage msg = new GridInstantMessage(); | 3532 | GridInstantMessage msg = new GridInstantMessage(); |
3536 | msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; | 3533 | msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid; |
3537 | msg.toAgentID = new Guid(user); // toAgentID.Guid; | 3534 | msg.toAgentID = new Guid(user); // toAgentID.Guid; |
3538 | msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here | 3535 | msg.imSessionID = new Guid(m_host.UUID.ToString()); // This is the item we're mucking with here |
3539 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); | 3536 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); |
3540 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); | 3537 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); |
3541 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; | 3538 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; |