Megapatch. Completely remove the multiparameter IM methods. Remove the insecure

fromAgentSession field.
This commit is contained in:
Melanie Thielker
2008-11-16 22:04:01 +00:00
parent 78d42a7fc8
commit 5e2e05a1c1
11 changed files with 135 additions and 171 deletions

View File

@@ -35,7 +35,6 @@ namespace OpenSim.Framework
{
public Guid fromAgentID;
public string fromAgentName;
public Guid fromAgentSession;
public Guid toAgentID;
public byte dialog;
public bool fromGroup;
@@ -56,14 +55,13 @@ namespace OpenSim.Framework
}
public GridInstantMessage(IScene scene, UUID _fromAgentID,
string _fromAgentName, UUID _fromAgentSession, UUID _toAgentID,
string _fromAgentName, UUID _toAgentID,
byte _dialog, bool _fromGroup, string _message,
UUID _imSessionID, bool _offline, Vector3 _position,
byte[] _binaryBucket)
{
fromAgentID = _fromAgentID.Guid;
fromAgentName = _fromAgentName;
fromAgentSession = _fromAgentSession.Guid;
toAgentID = _toAgentID.Guid;
dialog = _dialog;
fromGroup = _fromGroup;
@@ -88,7 +86,7 @@ namespace OpenSim.Framework
string _fromAgentName, UUID _toAgentID, byte _dialog,
string _message, bool _offline,
Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
UUID.Zero, _toAgentID, _dialog, false, _message,
_toAgentID, _dialog, false, _message,
_fromAgentID ^ _toAgentID, _offline, _position, new byte[0])
{
}

View File

@@ -46,12 +46,7 @@ namespace OpenSim.Framework
public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e);
public delegate void ImprovedInstantMessage(IClientAPI remoteclient,
UUID fromAgentID, UUID fromAgentSession, UUID toAgentID,
UUID imSessionID, uint timestamp,
string fromAgentName, string message, byte dialog, bool fromGroup,
byte offline, uint ParentEstateID,
Vector3 Position, UUID RegionID, byte[] binaryBucket);
public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im);
// This shouldn't be cut down...
// especially if we're ever going to implement groups, presence, estate message dialogs...