From 1c93854b47faaead803a8d15d8cb59d9c54e536e Mon Sep 17 00:00:00 2001
From: Dan Lake <dan.lake@intel.com>
Date: Thu, 23 Sep 2010 11:51:34 -0700
Subject: [PATCH] Some little changes to clean up refresh to 0719

---
 .../ClientStack/LindenUDP/LLClientView.cs      |  6 +++---
 .../RegionSyncModule/RegionSyncClientView.cs   |  2 +-
 .../Region/Framework/Scenes/ScenePresence.cs   | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 83a0cc5c6c..7dacd939df 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3489,9 +3489,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void ProcessEntityUpdates(int maxUpdates)
         {
-            Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
-            Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
-            Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+            OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
 
             if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
             int updatesThisCall = 0;
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs
index 85037a598a..a22a9844bd 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs
@@ -482,7 +482,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                         ScenePresence presence;
                         if (m_scene.TryGetScenePresence(agentID, out presence))
                         {
-                            int delay = 5000;
+                            int delay = 30000;
                             string name = presence.Name;
                             //m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID);
                             Timer appearanceSetter = new Timer(delegate(object obj)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 57b159f6f9..532f7ef446 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -439,6 +439,7 @@ namespace OpenSim.Region.Framework.Scenes
         public IClientAPI ControllingClient
         {
             get { return m_controllingClient; }
+            set { m_controllingClient = value; }
         }
 
         public IClientCore ClientView
@@ -565,6 +566,20 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_health = value; }
         }
 
+        private bool m_isSyncedAvatar;
+        public bool IsSyncedAvatar
+        {
+            get { return m_isSyncedAvatar; }
+            set { m_isSyncedAvatar = value; }
+        }
+
+        private bool m_isBalancing;
+        public bool IsBalancing
+        {
+            get { return m_isBalancing; }
+            set { m_isBalancing = value; }
+        }
+
         /// <summary>
         /// These are the region handles known by the avatar.
         /// </summary>
@@ -753,7 +768,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void RegisterToEvents()
         {
             // REGION SYNC
-            if (!m_scene.IsSyncedClient())
+            if (!m_scene.IsSyncedServer())// || m_scene.RegionSyncEnabled == false)
             {
                 // These client messages will not be handled by client managers but instead
                 // they are caught by the RegionSyncClient module and passed up to the auth sim
@@ -2436,6 +2451,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_perfMonMS = Util.EnvironmentTickCount();
             m_controllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
             m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
+        }
 
         /// <summary>
         /// Tell other client about this avatar (The client previously didn't know or had outdated details about this avatar)