diff options
author | Kitto Flora | 2010-11-11 04:51:05 +0000 |
---|---|---|
committer | Kitto Flora | 2010-11-11 04:51:05 +0000 |
commit | b2aeea66e36593ccab973240bab43724f577165b (patch) | |
tree | 4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Fix excessive forward motion and flailing while descending a slope, prevent a... (diff) | |
parent | Prevent teleporting to a region when the egent is banned in all parcels (diff) | |
download | opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.zip opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.gz opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2 opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-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 f20eb33..fd23ed2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1272,7 +1272,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1272 | 1272 | ||
1273 | m_log.DebugFormat( | 1273 | m_log.DebugFormat( |
1274 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1274 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1275 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1275 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
1276 | } | 1276 | } |
1277 | 1277 | ||
1278 | /// <summary> | 1278 | /// <summary> |