ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert adding a new IM parameter ( commit bf604c85c6

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

19
OpenSim/Framework/GridInstantMessage.cs
View File

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