Merge git://opensimulator.org/git/opensim

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 1d93382..d1a0440 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -66,8 +66,8 @@ namespace OpenSim.Client.MXP.ClientStack
         private readonly IScene m_scene;
         private readonly string m_firstName;
         private readonly string m_lastName;
-        private int m_objectsToSynchronize = 0;
-        private int m_objectsSynchronized = -1;
+//        private int m_objectsToSynchronize = 0;
+//        private int m_objectsSynchronized = -1;
 
         private Vector3 m_startPosition=new Vector3(128f, 128f, 128f);
         #endregion
@@ -462,8 +462,8 @@ namespace OpenSim.Client.MXP.ClientStack
 
         public void MXPSendSynchronizationBegin(int objectCount)
         {
-            m_objectsToSynchronize = objectCount;
-            m_objectsSynchronized = 0;
+//            m_objectsToSynchronize = objectCount;
+//            m_objectsSynchronized = 0;
             SynchronizationBeginEventMessage synchronizationBeginEventMessage = new SynchronizationBeginEventMessage();
             synchronizationBeginEventMessage.ObjectCount = (uint)objectCount;
             Session.Send(synchronizationBeginEventMessage);
@@ -1252,7 +1252,7 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
         {
             // Need to translate to MXP somehow
         }