diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -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 fe9dc56..2e58a46 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1133,7 +1133,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1133 | 1133 | ||
| 1134 | m_log.DebugFormat( | 1134 | m_log.DebugFormat( |
| 1135 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1135 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
| 1136 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1136 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
| 1137 | } | 1137 | } |
| 1138 | 1138 | ||
| 1139 | /// <summary> | 1139 | /// <summary> |