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

revert adding a new IM parameter ( commit bf604c85c6 

, that was a mistake. this should fix invites accepts etc, that got broken
LSLKeyTest
UbitUmarov 2016-07-28 08:22:51 +01:00
parent 19df2a2916
commit 16a7232f55
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/GridInstantMessage.cs
View File

@ -47,7 +47,6 @@ namespace OpenSim.Framework
public uint ParentEstateID; public uint ParentEstateID;
public Guid RegionID; public Guid RegionID;
public uint timestamp; public uint timestamp;
public Guid ID;
public GridInstantMessage() public GridInstantMessage()
{ {
@ -68,7 +67,6 @@ namespace OpenSim.Framework
binaryBucket = im.binaryBucket; binaryBucket = im.binaryBucket;
RegionID = im.RegionID; RegionID = im.RegionID;
ParentEstateID = im.ParentEstateID; ParentEstateID = im.ParentEstateID;
ID = im.ID;
if (addTimestamp) if (addTimestamp)
timestamp = (uint)Util.UnixTimeSinceEpoch(); timestamp = (uint)Util.UnixTimeSinceEpoch();
@ -78,7 +76,7 @@ namespace OpenSim.Framework
string _fromAgentName, UUID _toAgentID, string _fromAgentName, UUID _toAgentID,
byte _dialog, bool _fromGroup, string _message, byte _dialog, bool _fromGroup, string _message,
UUID _imSessionID, bool _offline, Vector3 _position, UUID _imSessionID, bool _offline, Vector3 _position,
byte[] _binaryBucket, UUID _ID, bool addTimestamp) byte[] _binaryBucket, bool addTimestamp)
{ {
fromAgentID = _fromAgentID.Guid; fromAgentID = _fromAgentID.Guid;
fromAgentName = _fromAgentName; fromAgentName = _fromAgentName;
@ -87,7 +85,6 @@ namespace OpenSim.Framework
fromGroup = _fromGroup; fromGroup = _fromGroup;
message = _message; message = _message;
imSessionID = _imSessionID.Guid; imSessionID = _imSessionID.Guid;
ID = _ID.Guid;
if (_offline) if (_offline)
offline = 1; offline = 1;
@ -106,22 +103,12 @@ namespace OpenSim.Framework
timestamp = (uint)Util.UnixTimeSinceEpoch(); timestamp = (uint)Util.UnixTimeSinceEpoch();
} }
public GridInstantMessage(IScene scene, UUID _fromAgentID,
string _fromAgentName, UUID _toAgentID,
byte _dialog, bool _fromGroup, string _message,
UUID _imSessionID, bool _offline, Vector3 _position,
byte[] _binaryBucket, bool addTimestamp) : this (scene, _fromAgentID,
_fromAgentName, _toAgentID, _dialog, _fromGroup, _message,
_imSessionID, _offline, _position, _binaryBucket, UUID.Zero, addTimestamp)
{
}
public GridInstantMessage(IScene scene, UUID _fromAgentID, public GridInstantMessage(IScene scene, UUID _fromAgentID,
string _fromAgentName, UUID _toAgentID, byte _dialog, string _fromAgentName, UUID _toAgentID, byte _dialog,
string _message, bool _offline, string _message, bool _offline,
Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
_toAgentID, _dialog, false, _message, _toAgentID, _dialog, false, _message,
_fromAgentID ^ _toAgentID, _offline, _position, new byte[0], UUID.Zero, true) _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true)
{ {
} }
} }

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -961,11 +961,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
= (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage); = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage);
msg.AgentData.AgentID = new UUID(im.fromAgentID); msg.AgentData.AgentID = new UUID(im.fromAgentID);
msg.AgentData.SessionID = new UUID(im.imSessionID); msg.AgentData.SessionID = UUID.Zero;
msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName); msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName);
msg.MessageBlock.Dialog = im.dialog; msg.MessageBlock.Dialog = im.dialog;
msg.MessageBlock.FromGroup = im.fromGroup; msg.MessageBlock.FromGroup = im.fromGroup;
msg.MessageBlock.ID = new UUID(im.ID); // this is odd
if (im.imSessionID == UUID.Zero.Guid)
msg.MessageBlock.ID = new UUID(im.fromAgentID) ^ new UUID(im.toAgentID);
else
msg.MessageBlock.ID = new UUID(im.imSessionID);
msg.MessageBlock.Offline = im.offline; msg.MessageBlock.Offline = im.offline;
msg.MessageBlock.ParentEstateID = im.ParentEstateID; msg.MessageBlock.ParentEstateID = im.ParentEstateID;
msg.MessageBlock.Position = im.Position; msg.MessageBlock.Position = im.Position;

6
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -216,7 +216,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
UUID fromAgentID = UUID.Zero; UUID fromAgentID = UUID.Zero;
UUID toAgentID = UUID.Zero; UUID toAgentID = UUID.Zero;
UUID imSessionID = UUID.Zero; UUID imSessionID = UUID.Zero;
UUID imID = UUID.Zero;
uint timestamp = 0; uint timestamp = 0;
string fromAgentName = ""; string fromAgentName = "";
string message = ""; string message = "";
@ -263,7 +262,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
UUID.TryParse((string)requestData["im_session_id"], out imSessionID); UUID.TryParse((string)requestData["im_session_id"], out imSessionID);
UUID.TryParse((string)requestData["region_id"], out RegionID); UUID.TryParse((string)requestData["region_id"], out RegionID);
UUID.TryParse((string)requestData["id"], out imID);
try try
{ {
@ -391,8 +389,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
gim.ParentEstateID = ParentEstateID; gim.ParentEstateID = ParentEstateID;
gim.Position = Position; gim.Position = Position;
gim.binaryBucket = binaryBucket; gim.binaryBucket = binaryBucket;
gim.ID = imID.Guid;
// Trigger the Instant message in the scene. // Trigger the Instant message in the scene.
foreach (Scene scene in m_Scenes) foreach (Scene scene in m_Scenes)
@ -702,8 +698,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
gim["from_agent_session"] = UUID.Zero.ToString(); gim["from_agent_session"] = UUID.Zero.ToString();
gim["to_agent_id"] = msg.toAgentID.ToString(); gim["to_agent_id"] = msg.toAgentID.ToString();
gim["im_session_id"] = msg.imSessionID.ToString(); gim["im_session_id"] = msg.imSessionID.ToString();
if(msg.ID != Guid.Empty)
gim["id"] = msg.ID.ToString();
gim["timestamp"] = msg.timestamp.ToString(); gim["timestamp"] = msg.timestamp.ToString();
gim["from_agent_name"] = msg.fromAgentName; gim["from_agent_name"] = msg.fromAgentName;
gim["message"] = msg.message; gim["message"] = msg.message;