aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs24
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9358a4a..b1094cc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes
70 { 70 {
71// ~ScenePresence() 71// ~ScenePresence()
72// { 72// {
73// m_log.Debug("[ScenePresence] Destructor called"); 73// m_log.Debug("[SCENE PRESENCE] Destructor called");
74// } 74// }
75 75
76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -517,7 +517,7 @@ namespace OpenSim.Region.Framework.Scenes
517 } 517 }
518 catch (Exception e) 518 catch (Exception e)
519 { 519 {
520 m_log.Error("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message); 520 m_log.Error("[SCENE PRESENCE]: ABSOLUTE POSITION " + e.Message);
521 } 521 }
522 } 522 }
523 523
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes
570 } 570 }
571 catch (Exception e) 571 catch (Exception e)
572 { 572 {
573 m_log.Error("[SCENEPRESENCE]: VELOCITY " + e.Message); 573 m_log.Error("[SCENE PRESENCE]: VELOCITY " + e.Message);
574 } 574 }
575 } 575 }
576 576
@@ -1008,7 +1008,7 @@ namespace OpenSim.Region.Framework.Scenes
1008 Animator.ResetAnimations(); 1008 Animator.ResetAnimations();
1009 1009
1010// m_log.DebugFormat( 1010// m_log.DebugFormat(
1011// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 1011// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
1012// Name, UUID, m_scene.RegionInfo.RegionName); 1012// Name, UUID, m_scene.RegionInfo.RegionName);
1013 1013
1014 // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing, 1014 // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing,
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.Framework.Scenes
1175 m_callbackURI = null; 1175 m_callbackURI = null;
1176 } 1176 }
1177 1177
1178 //m_log.DebugFormat("Completed movement"); 1178 m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
1179 1179
1180 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 1180 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
1181 SendInitialData(); 1181 SendInitialData();
@@ -2416,7 +2416,7 @@ namespace OpenSim.Region.Framework.Scenes
2416 Vector3 pos = m_pos; 2416 Vector3 pos = m_pos;
2417 pos.Z += m_appearance.HipOffset; 2417 pos.Z += m_appearance.HipOffset;
2418 2418
2419 //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); 2419 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity);
2420 2420
2421 remoteClient.SendPrimUpdate( 2421 remoteClient.SendPrimUpdate(
2422 this, 2422 this,
@@ -2503,6 +2503,7 @@ namespace OpenSim.Region.Framework.Scenes
2503 /// </summary> 2503 /// </summary>
2504 private void SendInitialData() 2504 private void SendInitialData()
2505 { 2505 {
2506 m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID);
2506 // Moved this into CompleteMovement to ensure that m_appearance is initialized before 2507 // Moved this into CompleteMovement to ensure that m_appearance is initialized before
2507 // the inventory arrives 2508 // the inventory arrives
2508 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); 2509 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
@@ -2547,10 +2548,11 @@ namespace OpenSim.Region.Framework.Scenes
2547 /// </summary> 2548 /// </summary>
2548 public void SendAvatarDataToAllAgents() 2549 public void SendAvatarDataToAllAgents()
2549 { 2550 {
2551 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
2550 // only send update from root agents to other clients; children are only "listening posts" 2552 // only send update from root agents to other clients; children are only "listening posts"
2551 if (IsChildAgent) 2553 if (IsChildAgent)
2552 { 2554 {
2553 m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); 2555 m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
2554 return; 2556 return;
2555 } 2557 }
2556 2558
@@ -2600,7 +2602,7 @@ namespace OpenSim.Region.Framework.Scenes
2600 /// <param name="avatar"></param> 2602 /// <param name="avatar"></param>
2601 public void SendAvatarDataToAgent(ScenePresence avatar) 2603 public void SendAvatarDataToAgent(ScenePresence avatar)
2602 { 2604 {
2603// m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); 2605 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
2604 2606
2605 avatar.ControllingClient.SendAvatarDataImmediate(this); 2607 avatar.ControllingClient.SendAvatarDataImmediate(this);
2606 if (Animator != null) 2608 if (Animator != null)
@@ -2613,10 +2615,11 @@ namespace OpenSim.Region.Framework.Scenes
2613 /// </summary> 2615 /// </summary>
2614 public void SendAppearanceToAllOtherAgents() 2616 public void SendAppearanceToAllOtherAgents()
2615 { 2617 {
2618 m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID);
2616 // only send update from root agents to other clients; children are only "listening posts" 2619 // only send update from root agents to other clients; children are only "listening posts"
2617 if (IsChildAgent) 2620 if (IsChildAgent)
2618 { 2621 {
2619 m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); 2622 m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
2620 return; 2623 return;
2621 } 2624 }
2622 2625
@@ -2642,6 +2645,7 @@ namespace OpenSim.Region.Framework.Scenes
2642 /// </summary> 2645 /// </summary>
2643 public void SendOtherAgentsAppearanceToMe() 2646 public void SendOtherAgentsAppearanceToMe()
2644 { 2647 {
2648 m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID);
2645 m_perfMonMS = Util.EnvironmentTickCount(); 2649 m_perfMonMS = Util.EnvironmentTickCount();
2646 2650
2647 int count = 0; 2651 int count = 0;
@@ -3826,4 +3830,4 @@ namespace OpenSim.Region.Framework.Scenes
3826 } 3830 }
3827 } 3831 }
3828 } 3832 }
3829} \ No newline at end of file 3833}