diff options
| author | Justin Clark-Casey (justincc) | 2010-10-29 23:15:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-29 23:15:35 +0100 |
| commit | abcde41c0dc003aa14577e3c58345c82d179c0d1 (patch) | |
| tree | 1a102c5141fafd8ba4760433abd07764e0e7beb9 /OpenSim/Region/Framework/Scenes | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| parent | add timing report to CompleteScenePresence for diagnostic purposes (diff) | |
| download | opensim-SC_OLD-abcde41c0dc003aa14577e3c58345c82d179c0d1.zip opensim-SC_OLD-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.gz opensim-SC_OLD-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.bz2 opensim-SC_OLD-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.xz | |
Merge branch 'justincc-dev'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9402f8b..1fc3ed6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1075,9 +1075,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1075 | /// </summary> | 1075 | /// </summary> |
| 1076 | public void CompleteMovement(IClientAPI client) | 1076 | public void CompleteMovement(IClientAPI client) |
| 1077 | { | 1077 | { |
| 1078 | // DEBUG ON | 1078 | DateTime startTime = DateTime.Now; |
| 1079 | m_log.WarnFormat("[SCENE PRESENCE]: CompleteMovement for {0}",UUID); | 1079 | |
| 1080 | // DEBUG OFF | 1080 | m_log.DebugFormat( |
| 1081 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | ||
| 1082 | client.Name, Scene.RegionInfo.RegionName); | ||
| 1081 | 1083 | ||
| 1082 | Vector3 look = Velocity; | 1084 | Vector3 look = Velocity; |
| 1083 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) | 1085 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) |
| @@ -1125,6 +1127,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1125 | if (friendsModule != null) | 1127 | if (friendsModule != null) |
| 1126 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1128 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
| 1127 | } | 1129 | } |
| 1130 | |||
| 1131 | m_log.DebugFormat( | ||
| 1132 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | ||
| 1133 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | ||
| 1128 | } | 1134 | } |
| 1129 | 1135 | ||
| 1130 | /// <summary> | 1136 | /// <summary> |