diff options
Diffstat (limited to 'OpenSim/Framework/GridInstantMessage.cs')
-rw-r--r-- | OpenSim/Framework/GridInstantMessage.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs index 6ae0488..a6bf6e3 100644 --- a/OpenSim/Framework/GridInstantMessage.cs +++ b/OpenSim/Framework/GridInstantMessage.cs | |||
@@ -44,6 +44,7 @@ namespace OpenSim.Framework | |||
44 | public Vector3 Position; | 44 | public Vector3 Position; |
45 | public byte[] binaryBucket; | 45 | public byte[] binaryBucket; |
46 | 46 | ||
47 | |||
47 | public uint ParentEstateID; | 48 | public uint ParentEstateID; |
48 | public Guid RegionID; | 49 | public Guid RegionID; |
49 | public uint timestamp; | 50 | public uint timestamp; |
@@ -57,7 +58,7 @@ namespace OpenSim.Framework | |||
57 | string _fromAgentName, UUID _toAgentID, | 58 | string _fromAgentName, UUID _toAgentID, |
58 | byte _dialog, bool _fromGroup, string _message, | 59 | byte _dialog, bool _fromGroup, string _message, |
59 | UUID _imSessionID, bool _offline, Vector3 _position, | 60 | UUID _imSessionID, bool _offline, Vector3 _position, |
60 | byte[] _binaryBucket, bool addTimestamp) | 61 | byte[] _binaryBucket) |
61 | { | 62 | { |
62 | fromAgentID = _fromAgentID.Guid; | 63 | fromAgentID = _fromAgentID.Guid; |
63 | fromAgentName = _fromAgentName; | 64 | fromAgentName = _fromAgentName; |
@@ -78,9 +79,7 @@ namespace OpenSim.Framework | |||
78 | ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID; | 79 | ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID; |
79 | RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid; | 80 | RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid; |
80 | } | 81 | } |
81 | 82 | timestamp = (uint)Util.UnixTimeSinceEpoch(); | |
82 | if (addTimestamp) | ||
83 | timestamp = (uint)Util.UnixTimeSinceEpoch(); | ||
84 | } | 83 | } |
85 | 84 | ||
86 | public GridInstantMessage(IScene scene, UUID _fromAgentID, | 85 | public GridInstantMessage(IScene scene, UUID _fromAgentID, |
@@ -88,7 +87,7 @@ namespace OpenSim.Framework | |||
88 | string _message, bool _offline, | 87 | string _message, bool _offline, |
89 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, | 88 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, |
90 | _toAgentID, _dialog, false, _message, | 89 | _toAgentID, _dialog, false, _message, |
91 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true) | 90 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0]) |
92 | { | 91 | { |
93 | } | 92 | } |
94 | } | 93 | } |