aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-21 20:05:11 +0100
committerJustin Clark-Casey (justincc)2011-09-21 20:05:11 +0100
commitc9c40343afb313ee6999c6dfb2663fb06bfac407 (patch)
tree2a2bf7ab76ad67446acad971d19b93118a616de3 /OpenSim/Region/Framework
parentWhen calling osNpcMoveTo(), rotate the avatar in the direction of travel. (diff)
parentNull simulation data must return a non-null region settings or other parts of... (diff)
downloadopensim-SC_OLD-c9c40343afb313ee6999c6dfb2663fb06bfac407.zip
opensim-SC_OLD-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.gz
opensim-SC_OLD-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.bz2
opensim-SC_OLD-c9c40343afb313ee6999c6dfb2663fb06bfac407.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-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 cd3cb60..5a3e587 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
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.Framework.Scenes
1012 Animator.ResetAnimations(); 1012 Animator.ResetAnimations();
1013 1013
1014// m_log.DebugFormat( 1014// m_log.DebugFormat(
1015// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 1015// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
1016// Name, UUID, m_scene.RegionInfo.RegionName); 1016// Name, UUID, m_scene.RegionInfo.RegionName);
1017 1017
1018 // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing, 1018 // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing,
@@ -1179,7 +1179,7 @@ namespace OpenSim.Region.Framework.Scenes
1179 m_callbackURI = null; 1179 m_callbackURI = null;
1180 } 1180 }
1181 1181
1182 //m_log.DebugFormat("Completed movement"); 1182 m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
1183 1183
1184 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 1184 m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
1185 SendInitialData(); 1185 SendInitialData();
@@ -2435,7 +2435,7 @@ namespace OpenSim.Region.Framework.Scenes
2435 Vector3 pos = m_pos; 2435 Vector3 pos = m_pos;
2436 pos.Z += m_appearance.HipOffset; 2436 pos.Z += m_appearance.HipOffset;
2437 2437
2438 //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); 2438 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity);
2439 2439
2440 remoteClient.SendPrimUpdate( 2440 remoteClient.SendPrimUpdate(
2441 this, 2441 this,
@@ -2522,6 +2522,7 @@ namespace OpenSim.Region.Framework.Scenes
2522 /// </summary> 2522 /// </summary>
2523 private void SendInitialData() 2523 private void SendInitialData()
2524 { 2524 {
2525 m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID);
2525 // Moved this into CompleteMovement to ensure that m_appearance is initialized before 2526 // Moved this into CompleteMovement to ensure that m_appearance is initialized before
2526 // the inventory arrives 2527 // the inventory arrives
2527 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); 2528 // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
@@ -2566,10 +2567,11 @@ namespace OpenSim.Region.Framework.Scenes
2566 /// </summary> 2567 /// </summary>
2567 public void SendAvatarDataToAllAgents() 2568 public void SendAvatarDataToAllAgents()
2568 { 2569 {
2570 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
2569 // only send update from root agents to other clients; children are only "listening posts" 2571 // only send update from root agents to other clients; children are only "listening posts"
2570 if (IsChildAgent) 2572 if (IsChildAgent)
2571 { 2573 {
2572 m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); 2574 m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
2573 return; 2575 return;
2574 } 2576 }
2575 2577
@@ -2619,7 +2621,7 @@ namespace OpenSim.Region.Framework.Scenes
2619 /// <param name="avatar"></param> 2621 /// <param name="avatar"></param>
2620 public void SendAvatarDataToAgent(ScenePresence avatar) 2622 public void SendAvatarDataToAgent(ScenePresence avatar)
2621 { 2623 {
2622// m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); 2624 m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
2623 2625
2624 avatar.ControllingClient.SendAvatarDataImmediate(this); 2626 avatar.ControllingClient.SendAvatarDataImmediate(this);
2625 if (Animator != null) 2627 if (Animator != null)
@@ -2632,10 +2634,11 @@ namespace OpenSim.Region.Framework.Scenes
2632 /// </summary> 2634 /// </summary>
2633 public void SendAppearanceToAllOtherAgents() 2635 public void SendAppearanceToAllOtherAgents()
2634 { 2636 {
2637 m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID);
2635 // only send update from root agents to other clients; children are only "listening posts" 2638 // only send update from root agents to other clients; children are only "listening posts"
2636 if (IsChildAgent) 2639 if (IsChildAgent)
2637 { 2640 {
2638 m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); 2641 m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
2639 return; 2642 return;
2640 } 2643 }
2641 2644
@@ -2661,6 +2664,7 @@ namespace OpenSim.Region.Framework.Scenes
2661 /// </summary> 2664 /// </summary>
2662 public void SendOtherAgentsAppearanceToMe() 2665 public void SendOtherAgentsAppearanceToMe()
2663 { 2666 {
2667 m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID);
2664 m_perfMonMS = Util.EnvironmentTickCount(); 2668 m_perfMonMS = Util.EnvironmentTickCount();
2665 2669
2666 int count = 0; 2670 int count = 0;
@@ -3845,4 +3849,4 @@ namespace OpenSim.Region.Framework.Scenes
3845 } 3849 }
3846 } 3850 }
3847 } 3851 }
3848} \ No newline at end of file 3852}