Revert "start sending terrain in scenePresence after well defined avatar. Minor"

This reverts commit 05a2feba5d780c57c252891a20071800fd9f2e3e.

1 files changed, 9 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8088dd3..24a92eb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3473,7 +3473,6 @@ namespace OpenSim.Region.Framework.Scenes
                         landch.sendClientInitialLandInfo(ControllingClient);
                     }
                 }
-                m_scene.SendLayerData(ControllingClient);
                 SendOtherAgentsAvatarDataToMe();
                 SendOtherAgentsAppearanceToMe();
 
@@ -5427,7 +5426,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (p.IsChildAgent)
                             continue;
-//                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
+                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
                         ControllingClient.SendAvatarDataImmediate(p);
                         p.SendAppearanceToAgent(this);
                         p.SendAttachmentsToClient(ControllingClient);
@@ -5455,7 +5454,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (ScenePresence p in killsToSendme)
                     {
-//                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
                         try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
                         catch (NullReferenceException) { }
                     }
@@ -5500,7 +5499,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in killsToSendto)
                 {
-//                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
                     try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
                     catch (NullReferenceException) { }
                 }
@@ -5510,7 +5509,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in killsToSendme)
                 {
-//                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
                     try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
                     catch (NullReferenceException) { }
                 }
@@ -5520,7 +5519,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in viewsToSendto)
                 {
-//                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
                     p.ControllingClient.SendAvatarDataImmediate(this);
                     SendAppearanceToAgent(p);
                     SendAttachmentsToClient(p.ControllingClient);
@@ -5533,9 +5532,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in viewsToSendme)
                 {
+                    m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
                     if (p.IsChildAgent)
                         continue;
-//                    m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
                     ControllingClient.SendAvatarDataImmediate(p);
                     p.SendAppearanceToAgent(this);
                     p.SendAttachmentsToClient(ControllingClient);
@@ -5604,7 +5603,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (ScenePresence p in killsToSendme)
                     {
-//                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                        m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
                         try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
                         catch (NullReferenceException) { }
                     }
@@ -5753,7 +5752,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in killsToSendto)
                 {
-//                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
                     try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
                     catch (NullReferenceException) { }
                 }
@@ -5763,7 +5762,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in killsToSendme)
                 {
-//                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
+                    m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
                     try {ControllingClient.SendKillObject(new List<uint> { p.LocalId }); }
                     catch (NullReferenceException) { }                    
                 }