2 files changed, 8 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 605c788..61e31e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3030,7 +3030,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
         {
-            client.OnRegionHandShakeReply += SendLayerData;
+//            client.OnRegionHandShakeReply += SendLayerData;
         }
         
         public virtual void SubscribeToClientPrimEvents(IClientAPI client)
@@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
         {
-            client.OnRegionHandShakeReply -= SendLayerData;
+//            client.OnRegionHandShakeReply -= SendLayerData;
         }
 
         public virtual void UnSubscribeToClientPrimEvents(IClientAPI client)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 045a450..cd5525c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1198,6 +1198,8 @@ no information to check this
                 }
                 AbsolutePosition = pos;
 
+                // reset camera to avatar pos
+                CameraPosition = pos;
 
                 if (m_teleportFlags == TeleportFlags.Default)
                 {
@@ -1733,6 +1735,10 @@ no information to check this
                         look = new Vector3(0.99f, 0.042f, 0);
                 }
 
+// start sending terrain patchs
+                if (!isNPC)
+                    Scene.SendLayerData(ControllingClient);
+
                 if (!IsChildAgent && !isNPC)
                 {
                     InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46);