aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:42:51 +0100
committerMelanie2011-10-11 22:42:51 +0100
commit833420e167c6eb910e7b75a1157388decf7365dc (patch)
tree76232a6b3a595f1164e4502c019ea791b9c1a32f
parentMerge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge (diff)
parentCommented out new debug statements in ScenePresence (diff)
downloadopensim-SC-833420e167c6eb910e7b75a1157388decf7365dc.zip
opensim-SC-833420e167c6eb910e7b75a1157388decf7365dc.tar.gz
opensim-SC-833420e167c6eb910e7b75a1157388decf7365dc.tar.bz2
opensim-SC-833420e167c6eb910e7b75a1157388decf7365dc.tar.xz
Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 09a8bb7..e0ec7c9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1323,7 +1323,7 @@ namespace OpenSim.Region.Framework.Scenes
1323 m_callbackURI = null; 1323 m_callbackURI = null;
1324 } 1324 }
1325 1325
1326 m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); 1326 //m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
1327 1327
1328 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 1328 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
1329 SendInitialData(); 1329 SendInitialData();
@@ -2871,7 +2871,7 @@ namespace OpenSim.Region.Framework.Scenes
2871 /// </summary> 2871 /// </summary>
2872 private void SendInitialData() 2872 private void SendInitialData()
2873 { 2873 {
2874 m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID); 2874 //m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID);
2875 // Moved this into CompleteMovement to ensure that m_appearance is initialized before 2875 // Moved this into CompleteMovement to ensure that m_appearance is initialized before
2876 // the inventory arrives 2876 // the inventory arrives
2877 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); 2877 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
@@ -2916,7 +2916,7 @@ namespace OpenSim.Region.Framework.Scenes
2916 /// </summary> 2916 /// </summary>
2917 public void SendAvatarDataToAllAgents() 2917 public void SendAvatarDataToAllAgents()
2918 { 2918 {
2919 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID); 2919 //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
2920 // only send update from root agents to other clients; children are only "listening posts" 2920 // only send update from root agents to other clients; children are only "listening posts"
2921 if (IsChildAgent) 2921 if (IsChildAgent)
2922 { 2922 {
@@ -2970,7 +2970,7 @@ namespace OpenSim.Region.Framework.Scenes
2970 /// <param name="avatar"></param> 2970 /// <param name="avatar"></param>
2971 public void SendAvatarDataToAgent(ScenePresence avatar) 2971 public void SendAvatarDataToAgent(ScenePresence avatar)
2972 { 2972 {
2973 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); 2973 //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
2974 2974
2975 avatar.ControllingClient.SendAvatarDataImmediate(this); 2975 avatar.ControllingClient.SendAvatarDataImmediate(this);
2976 if (Animator != null) 2976 if (Animator != null)
@@ -3013,7 +3013,7 @@ namespace OpenSim.Region.Framework.Scenes
3013 /// </summary> 3013 /// </summary>
3014 public void SendOtherAgentsAppearanceToMe() 3014 public void SendOtherAgentsAppearanceToMe()
3015 { 3015 {
3016 m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); 3016 //m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID);
3017 m_perfMonMS = Util.EnvironmentTickCount(); 3017 m_perfMonMS = Util.EnvironmentTickCount();
3018 3018
3019 int count = 0; 3019 int count = 0;