diff options
| author | BlueWall | 2012-01-05 17:54:51 -0500 |
|---|---|---|
| committer | BlueWall | 2012-01-05 17:54:51 -0500 |
| commit | f252161941f10e1d303b372b946945fb6b548019 (patch) | |
| tree | 6037b7ddcb488dc17258f60cfb52756b86f718d6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'new_modules' (diff) | |
| parent | Add a "j2k decode" region console command that allows a manual request for a ... (diff) | |
| download | opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.zip opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.gz opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.bz2 opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 3d1c1b5..42cd4be 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2844,7 +2844,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2844 | Velocity = Vector3.Zero; | 2844 | Velocity = Vector3.Zero; |
| 2845 | AbsolutePosition = pos; | 2845 | AbsolutePosition = pos; |
| 2846 | 2846 | ||
| 2847 | m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); | 2847 | // m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); |
| 2848 | 2848 | ||
| 2849 | AddToPhysicalScene(isFlying); | 2849 | AddToPhysicalScene(isFlying); |
| 2850 | } | 2850 | } |