diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 112b66d7a9..62f0b32126 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4814,7 +4814,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             EntityUpdate update;
 
-            bool viewerCache = m_supportViewerCache && (m_viewerHandShakeFlags & 1) != 0;// && mysp.IsChildAgent; // only on child agents
+            bool viewerCache = m_supportViewerCache;// && mysp.IsChildAgent; // only on child agents
             bool doCulling = m_scene.ObjectsCullingByDistance;
             float cullingrange = 64.0f;
             Vector3 mypos = Vector3.Zero;
@@ -5650,7 +5650,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if(GroupsNeedFullUpdate.Count > 0)
             {
-                bool sendProbes = m_supportViewerCache && (m_viewerHandShakeFlags & 1) != 0 && (m_viewerHandShakeFlags & 2) == 0;
+                bool sendProbes = m_supportViewerCache && (m_viewerHandShakeFlags & 2) == 0;
 
                 if(sendProbes)
                 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 6746573860..19535dcfc2 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public int IncomingOrphanedPacketCount { get; protected set; }
 
-        public bool SupportViewerObjectsCache = false;
+        public bool SupportViewerObjectsCache = true;
         /// <summary>
         /// Run queue empty processing within a single persistent thread.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index aea3a8db47..c536184f8c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4045,11 +4045,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                         Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
                         m_callbackURI = null;
-                        //NeedInitialData = 4;
-                        //return;
                     }
                     // v0.7 close HG sender region
-                    if (!string.IsNullOrEmpty(m_newCallbackURI))
+                    else if (!string.IsNullOrEmpty(m_newCallbackURI))
                     {
                         m_log.DebugFormat(
                             "[SCENE PRESENCE({0})]: Releasing {1} {2} with callback to {3}",
@@ -4062,8 +4060,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                         Scene.SimulationService.ReleaseAgent(originID, UUID, m_newCallbackURI);
                         m_newCallbackURI = null;
-                        //NeedInitialData = 4;
-                        //return;
                     }
                     IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                     if (m_agentTransfer != null)
@@ -4096,12 +4092,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    bool cacheCulling = (flags & 1) != 0;
-                    bool cacheEmpty;
-                    if (cacheCulling)
-                        cacheEmpty = (flags & 2) != 0;
-                    else
-                        cacheEmpty = true;
+                    //bool cacheCulling = (flags & 1) != 0;
+                    bool cacheEmpty = (flags & 2) != 0;;
 
                     EntityBase[] entities = Scene.Entities.GetEntities();
                     if(cacheEmpty)