diff options
author | Melanie Thielker | 2008-11-16 22:04:01 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-16 22:04:01 +0000 |
commit | 5e2e05a1c1cf083c52728798c809711f4e2f52ae (patch) | |
tree | a51ab47c0d6e83a31fc02e0b840911bf936fe802 /OpenSim/Framework/GridInstantMessage.cs | |
parent | - Fix a formatting error in a log message (Mantis#2635). (diff) | |
download | opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.zip opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.gz opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.bz2 opensim-SC-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.xz |
Megapatch. Completely remove the multiparameter IM methods. Remove the insecure
fromAgentSession field.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/GridInstantMessage.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs index 9cecf42..64eec22 100644 --- a/OpenSim/Framework/GridInstantMessage.cs +++ b/OpenSim/Framework/GridInstantMessage.cs | |||
@@ -35,7 +35,6 @@ namespace OpenSim.Framework | |||
35 | { | 35 | { |
36 | public Guid fromAgentID; | 36 | public Guid fromAgentID; |
37 | public string fromAgentName; | 37 | public string fromAgentName; |
38 | public Guid fromAgentSession; | ||
39 | public Guid toAgentID; | 38 | public Guid toAgentID; |
40 | public byte dialog; | 39 | public byte dialog; |
41 | public bool fromGroup; | 40 | public bool fromGroup; |
@@ -56,14 +55,13 @@ namespace OpenSim.Framework | |||
56 | } | 55 | } |
57 | 56 | ||
58 | public GridInstantMessage(IScene scene, UUID _fromAgentID, | 57 | public GridInstantMessage(IScene scene, UUID _fromAgentID, |
59 | string _fromAgentName, UUID _fromAgentSession, UUID _toAgentID, | 58 | string _fromAgentName, UUID _toAgentID, |
60 | byte _dialog, bool _fromGroup, string _message, | 59 | byte _dialog, bool _fromGroup, string _message, |
61 | UUID _imSessionID, bool _offline, Vector3 _position, | 60 | UUID _imSessionID, bool _offline, Vector3 _position, |
62 | byte[] _binaryBucket) | 61 | byte[] _binaryBucket) |
63 | { | 62 | { |
64 | fromAgentID = _fromAgentID.Guid; | 63 | fromAgentID = _fromAgentID.Guid; |
65 | fromAgentName = _fromAgentName; | 64 | fromAgentName = _fromAgentName; |
66 | fromAgentSession = _fromAgentSession.Guid; | ||
67 | toAgentID = _toAgentID.Guid; | 65 | toAgentID = _toAgentID.Guid; |
68 | dialog = _dialog; | 66 | dialog = _dialog; |
69 | fromGroup = _fromGroup; | 67 | fromGroup = _fromGroup; |
@@ -88,7 +86,7 @@ namespace OpenSim.Framework | |||
88 | string _fromAgentName, UUID _toAgentID, byte _dialog, | 86 | string _fromAgentName, UUID _toAgentID, byte _dialog, |
89 | string _message, bool _offline, | 87 | string _message, bool _offline, |
90 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, | 88 | Vector3 _position) : this(scene, _fromAgentID, _fromAgentName, |
91 | UUID.Zero, _toAgentID, _dialog, false, _message, | 89 | _toAgentID, _dialog, false, _message, |
92 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0]) | 90 | _fromAgentID ^ _toAgentID, _offline, _position, new byte[0]) |
93 | { | 91 | { |
94 | } | 92 | } |