1 files changed, 0 insertions, 28 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8906c6f..839259f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -135,7 +135,6 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 m_lastPosition;
         private Quaternion m_lastRotation;
         private Vector3 m_lastVelocity;
-        //private int m_lastTerseSent;
 
         private Vector3? m_forceToApply;
         private int m_userFlags;
@@ -645,14 +644,6 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_health = value; }
         }
 
-        private ISceneViewer m_sceneViewer;
-
-        public ISceneViewer SceneViewer
-        {
-            get { return m_sceneViewer; }
-            private set { m_sceneViewer = value; }
-        }
-
         public void AdjustKnownSeeds()
         {
             Dictionary<ulong, string> seeds;
@@ -756,7 +747,6 @@ namespace OpenSim.Region.Framework.Scenes
             AttachmentsSyncLock = new Object();
 
             m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
-            SceneViewer = new SceneViewer(this);
             Animator = new ScenePresenceAnimator(this);
             PresenceType = type;
             DrawDistance = world.DefaultDrawDistance;
@@ -867,16 +857,6 @@ namespace OpenSim.Region.Framework.Scenes
             return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);
         }
 
-        /// <summary>
-        /// Send updates to the client about prims which have been placed on the update queue.  We don't
-        /// necessarily send updates for all the parts on the queue, e.g. if an updates with a more recent
-        /// timestamp has already been sent.
-        /// </summary>
-        public void SendPrimUpdates()
-        {
-            SceneViewer.SendPrimUpdates();
-        }
-
         #region Status Methods
 
         /// <summary>
@@ -2420,10 +2400,6 @@ namespace OpenSim.Region.Framework.Scenes
             const float ROTATION_TOLERANCE = 0.01f;
             const float VELOCITY_TOLERANCE = 0.001f;
             const float POSITION_TOLERANCE = 0.05f;
-            //const int TIME_MS_TOLERANCE = 3000;
-
-            if (!sendingPrims)
-                Util.FireAndForget(delegate { sendingPrims = true; SendPrimUpdates(); sendingPrims = false; });
 
             if (IsChildAgent == false)
             {
@@ -2435,7 +2411,6 @@ namespace OpenSim.Region.Framework.Scenes
                 if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
                     !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
                     !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
-                    //Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
                 {
                     SendTerseUpdateToAllClients();
 
@@ -2443,7 +2418,6 @@ namespace OpenSim.Region.Framework.Scenes
                     m_lastPosition = m_pos;
                     m_lastRotation = Rotation;
                     m_lastVelocity = Velocity;
-                    //m_lastTerseSent = Environment.TickCount;
                 }
 
                 // followed suggestion from mic bowman. reversed the two lines below.
@@ -3430,8 +3404,6 @@ namespace OpenSim.Region.Framework.Scenes
             // unsetting the elapsed callback should be enough to allow for cleanup however.
             // m_reprioritizationTimer.Dispose(); 
 
-            SceneViewer.Close();
-
             RemoveFromPhysicalScene();
             Animator.Close();
             Animator = null;