aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-08-16 21:53:45 +0100
committerUbitUmarov2014-08-16 21:53:45 +0100
commitf6642a1cc88db4d021a5f6ed8e983622bb598003 (patch)
tree36c4e10b6c7430b9be35ccde564c45c5e1ce4edd
parentsend avatar Height to children, use it in region tp height check (diff)
downloadopensim-SC-f6642a1cc88db4d021a5f6ed8e983622bb598003.zip
opensim-SC-f6642a1cc88db4d021a5f6ed8e983622bb598003.tar.gz
opensim-SC-f6642a1cc88db4d021a5f6ed8e983622bb598003.tar.bz2
opensim-SC-f6642a1cc88db4d021a5f6ed8e983622bb598003.tar.xz
minor low resolution debug timming
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 890160b..f639668 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1674,8 +1674,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1674 1674
1675 public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying) 1675 public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
1676 { 1676 {
1677 int ts = Util.EnvironmentTickCount();
1677 try 1678 try
1678 { 1679 {
1680
1679 AgentData cAgent = new AgentData(); 1681 AgentData cAgent = new AgentData();
1680 agent.CopyTo(cAgent); 1682 agent.CopyTo(cAgent);
1681 cAgent.Position = pos + agent.Velocity; 1683 cAgent.Position = pos + agent.Velocity;
@@ -1704,6 +1706,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1704 return false; 1706 return false;
1705 } 1707 }
1706 1708
1709 m_log.DebugFormat("[CrossAgentIntoNewRegionMain] ok, time {0}ms",Util.EnvironmentTickCountSubtract(ts));
1710
1707 } 1711 }
1708 catch (Exception e) 1712 catch (Exception e)
1709 { 1713 {
@@ -1721,6 +1725,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1721 public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, 1725 public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
1722 bool isFlying, string version) 1726 bool isFlying, string version)
1723 { 1727 {
1728
1724 agent.ControllingClient.RequestClientInfo(); 1729 agent.ControllingClient.RequestClientInfo();
1725 1730
1726 string agentcaps; 1731 string agentcaps;
@@ -1784,8 +1789,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1784// agent.SendOtherAgentsAvatarDataToMe(); 1789// agent.SendOtherAgentsAvatarDataToMe();
1785// agent.SendOtherAgentsAppearanceToMe(); 1790// agent.SendOtherAgentsAppearanceToMe();
1786 1791
1787
1788
1789 // Next, let's close the child agent connections that are too far away. 1792 // Next, let's close the child agent connections that are too far away.
1790 uint neighbourx; 1793 uint neighbourx;
1791 uint neighboury; 1794 uint neighboury;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index faa5334..fc08b07 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1754,7 +1754,7 @@ namespace OpenSim.Region.Framework.Scenes
1754 /// </param> 1754 /// </param>
1755 public void CompleteMovement(IClientAPI client, bool openChildAgents) 1755 public void CompleteMovement(IClientAPI client, bool openChildAgents)
1756 { 1756 {
1757// DateTime startTime = DateTime.Now; 1757 int ts = Util.EnvironmentTickCount();
1758 1758
1759 m_log.InfoFormat( 1759 m_log.InfoFormat(
1760 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", 1760 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
@@ -1947,6 +1947,8 @@ namespace OpenSim.Region.Framework.Scenes
1947 ParcelLoginCheck(m_currentParcelUUID); 1947 ParcelLoginCheck(m_currentParcelUUID);
1948 m_currentParcelHide = newhide; 1948 m_currentParcelHide = newhide;
1949 } 1949 }
1950
1951 m_log.DebugFormat("[CompleteMovement] end: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1950 } 1952 }
1951 1953
1952 /// <summary> 1954 /// <summary>