diff options
| author | Melanie | 2011-11-05 22:56:08 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 22:56:08 +0000 |
| commit | facdc9c46e45ebd29217d7f217aec6b16048cc73 (patch) | |
| tree | ce4a0ce073ae6eb087c3d47e2cf7fec1b3e25bea /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Whitespace fix from core (diff) | |
| parent | Remove spammy autopilot debug (diff) | |
| download | opensim-SC_OLD-facdc9c46e45ebd29217d7f217aec6b16048cc73.zip opensim-SC_OLD-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.gz opensim-SC_OLD-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.bz2 opensim-SC_OLD-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1067b9d..76bc390 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1813,8 +1813,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1813 | if (SitGround) | 1813 | if (SitGround) |
| 1814 | StandUp(); | 1814 | StandUp(); |
| 1815 | 1815 | ||
| 1816 | m_log.DebugFormat( | 1816 | // m_log.DebugFormat( |
| 1817 | "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", | 1817 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", |
| 1818 | Name, pos, m_scene.RegionInfo.RegionName); | 1818 | Name, pos, m_scene.RegionInfo.RegionName); |
| 1819 | 1819 | ||
| 1820 | if (pos.X < 0 || pos.X >= Constants.RegionSize | 1820 | if (pos.X < 0 || pos.X >= Constants.RegionSize |
| @@ -1879,7 +1879,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1879 | /// </summary> | 1879 | /// </summary> |
| 1880 | public void ResetMoveToTarget() | 1880 | public void ResetMoveToTarget() |
| 1881 | { | 1881 | { |
| 1882 | m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); | 1882 | // m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); |
| 1883 | 1883 | ||
| 1884 | MovingToTarget = false; | 1884 | MovingToTarget = false; |
| 1885 | MoveToPositionTarget = Vector3.Zero; | 1885 | MoveToPositionTarget = Vector3.Zero; |