diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b637317..cc9c445 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1270 | 1270 | ||
1271 | m_log.DebugFormat( | 1271 | m_log.DebugFormat( |
1272 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1272 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1273 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1273 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | /// <summary> | 1276 | /// <summary> |