diff options
author | Justin Clark-Casey (justincc) | 2011-09-22 01:11:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-22 01:11:19 +0100 |
commit | 41616cad09ad5a2936635dfca4caf38c89d00b38 (patch) | |
tree | aa5bec8a5b0323db86a4dd116670f927ee66aed6 | |
parent | Fix failure to teleport when an agent is lured on the same sim (and probably ... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-41616cad09ad5a2936635dfca4caf38c89d00b38.zip opensim-SC_OLD-41616cad09ad5a2936635dfca4caf38c89d00b38.tar.gz opensim-SC_OLD-41616cad09ad5a2936635dfca4caf38c89d00b38.tar.bz2 opensim-SC_OLD-41616cad09ad5a2936635dfca4caf38c89d00b38.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a7b189b..5b02c3b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1176,7 +1176,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1176 | m_callbackURI = null; | 1176 | m_callbackURI = null; |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); | 1179 | //m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); |
1180 | 1180 | ||
1181 | m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); | 1181 | m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); |
1182 | SendInitialData(); | 1182 | SendInitialData(); |
@@ -2523,7 +2523,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2523 | /// </summary> | 2523 | /// </summary> |
2524 | private void SendInitialData() | 2524 | private void SendInitialData() |
2525 | { | 2525 | { |
2526 | m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID); | 2526 | //m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID); |
2527 | // Moved this into CompleteMovement to ensure that m_appearance is initialized before | 2527 | // Moved this into CompleteMovement to ensure that m_appearance is initialized before |
2528 | // the inventory arrives | 2528 | // the inventory arrives |
2529 | // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); | 2529 | // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); |
@@ -2568,7 +2568,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2568 | /// </summary> | 2568 | /// </summary> |
2569 | public void SendAvatarDataToAllAgents() | 2569 | public void SendAvatarDataToAllAgents() |
2570 | { | 2570 | { |
2571 | m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID); | 2571 | //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID); |
2572 | // only send update from root agents to other clients; children are only "listening posts" | 2572 | // only send update from root agents to other clients; children are only "listening posts" |
2573 | if (IsChildAgent) | 2573 | if (IsChildAgent) |
2574 | { | 2574 | { |
@@ -2622,7 +2622,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2622 | /// <param name="avatar"></param> | 2622 | /// <param name="avatar"></param> |
2623 | public void SendAvatarDataToAgent(ScenePresence avatar) | 2623 | public void SendAvatarDataToAgent(ScenePresence avatar) |
2624 | { | 2624 | { |
2625 | m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); | 2625 | //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); |
2626 | 2626 | ||
2627 | avatar.ControllingClient.SendAvatarDataImmediate(this); | 2627 | avatar.ControllingClient.SendAvatarDataImmediate(this); |
2628 | if (Animator != null) | 2628 | if (Animator != null) |
@@ -2665,7 +2665,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2665 | /// </summary> | 2665 | /// </summary> |
2666 | public void SendOtherAgentsAppearanceToMe() | 2666 | public void SendOtherAgentsAppearanceToMe() |
2667 | { | 2667 | { |
2668 | m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); | 2668 | //m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); |
2669 | m_perfMonMS = Util.EnvironmentTickCount(); | 2669 | m_perfMonMS = Util.EnvironmentTickCount(); |
2670 | 2670 | ||
2671 | int count = 0; | 2671 | int count = 0; |