Merge branch 'master' into httptests

1 files changed, 3 insertions, 16 deletions

diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 53d98db..6954c64 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -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;
@@ -107,21 +104,11 @@ namespace OpenSim.Framework
         }
 
         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)
         {
         }
     }