diff options
author | UbitUmarov | 2016-07-24 15:17:25 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-24 15:17:25 +0100 |
commit | bf604c85c66dd3bed06e3103cdf210ede02c151f (patch) | |
tree | ca4bbbeea4336bc971fc7c2ffbebfbbeb7e3f929 /OpenSim/Framework/GridInstantMessage.cs | |
parent | do not send IMs via child agents (diff) | |
download | opensim-SC-bf604c85c66dd3bed06e3103cdf210ede02c151f.zip opensim-SC-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.gz opensim-SC-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.bz2 opensim-SC-bf604c85c66dd3bed06e3103cdf210ede02c151f.tar.xz |
add missing IM parameter ( needs fix where it is really relevant )
Diffstat (limited to 'OpenSim/Framework/GridInstantMessage.cs')
-rw-r--r-- | OpenSim/Framework/GridInstantMessage.cs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs index da3690c..d856173 100644 --- a/OpenSim/Framework/GridInstantMessage.cs +++ b/OpenSim/Framework/GridInstantMessage.cs | |||
@@ -47,6 +47,7 @@ namespace OpenSim.Framework | |||
47 | public uint ParentEstateID; | 47 | public uint ParentEstateID; |
48 | public Guid RegionID; | 48 | public Guid RegionID; |
49 | public uint timestamp; | 49 | public uint timestamp; |
50 | public Guid ID; | ||
50 | 51 | ||
51 | public GridInstantMessage() | 52 | public GridInstantMessage() |
52 | { | 53 | { |
@@ -66,6 +67,8 @@ namespace OpenSim.Framework | |||
66 | Position = im.Position; | 67 | Position = im.Position; |
67 | binaryBucket = im.binaryBucket; | 68 | binaryBucket = im.binaryBucket; |
68 | RegionID = im.RegionID; | 69 | RegionID = im.RegionID; |
70 | ParentEstateID = im.ParentEstateID; | ||
71 | ID = im.ID; | ||
69 | 72 | ||
70 | if (addTimestamp) | 73 | if (addTimestamp) |
71 | timestamp = (uint)Util.UnixTimeSinceEpoch(); | 74 | timestamp = (uint)Util.UnixTimeSinceEpoch(); |
@@ -75,7 +78,7 @@ namespace OpenSim.Framework | |||
75 | string _fromAgentName, UUID _toAgentID, | 78 | string _fromAgentName, UUID _toAgentID, |
76 | byte _dialog, bool _fromGroup, string _message, | 79 | byte _dialog, bool _fromGroup, string _message, |
77 | UUID _imSessionID, bool _offline, Vector3 _position, | 80 | UUID _imSessionID, bool _offline, Vector3 _position, |
78 | byte[] _binaryBucket, bool addTimestamp) | 81 | byte[] _binaryBucket, UUID _ID, bool addTimestamp) |
79 | { | 82 | { |
80 | fromAgentID = _fromAgentID.Guid; | 83 | fromAgentID = _fromAgentID.Guid; |
81 | fromAgentName = _fromAgentName; | 84 | fromAgentName = _fromAgentName; |
@@ -84,6 +87,8 @@ namespace OpenSim.Framework | |||
84 | fromGroup = _fromGroup; | 87 | fromGroup = _fromGroup; |
85 | message = _message; | 88 | message = _message; |
86 | imSessionID = _imSessionID.Guid; | 89 | imSessionID = _imSessionID.Guid; |
90 | ID = _ID.Guid; | ||
91 | |||
87 | if (_offline) | 92 | if (_offline) |
88 | offline = 1; | 93 | offline = 1; |
89 | else | 94 | else |
@@ -102,11 +107,21 @@ namespace OpenSim.Framework | |||
102 | } | 107 | } |
103 | 108 | ||
104 | public GridInstantMessage(IScene scene, UUID _fromAgentID, | 109 | public GridInstantMessage(IScene scene, UUID _fromAgentID, |
110 | string _fromAgentName, UUID _toAgentID, | ||
111 | byte _dialog, bool _fromGroup, string _message, | ||
112 | UUID _imSessionID, bool _offline, Vector3 _position, | ||
113 | byte[] _binaryBucket, bool addTimestamp) : this(scene, _fromAgentID, _fromAgentName, | ||
114 | _toAgentID, _dialog, false, _message, | ||
115 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], UUID.Zero, true) | ||
116 | { | ||
117 | } | ||
118 | |||
119 | public GridInstantMessage(IScene scene, UUID _fromAgentID, | ||
105 | string _fromAgentName, UUID _toAgentID, byte _dialog, | 120 | string _fromAgentName, UUID _toAgentID, byte _dialog, |
106 | string _message, bool _offline, | 121 | string _message, bool _offline, |
107 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, | 122 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, |
108 | _toAgentID, _dialog, false, _message, | 123 | _toAgentID, _dialog, false, _message, |
109 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true) | 124 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], UUID.Zero, true) |
110 | { | 125 | { |
111 | } | 126 | } |
112 | } | 127 | } |