diff options
| author | Melanie | 2012-01-05 08:15:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-05 08:15:33 +0000 |
| commit | 1ebc9d04aa33e18e22ee2f03465bc5950c3544ce (patch) | |
| tree | 3e7e39255ad455b59434979d47db7da243ac3dd6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.zip opensim-SC-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.gz opensim-SC-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.bz2 opensim-SC-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.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 845553a..a301ccb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2855,7 +2855,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2855 | Velocity = Vector3.Zero; | 2855 | Velocity = Vector3.Zero; |
| 2856 | AbsolutePosition = pos; | 2856 | AbsolutePosition = pos; |
| 2857 | 2857 | ||
| 2858 | m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); | 2858 | // m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); |
| 2859 | 2859 | ||
| 2860 | AddToPhysicalScene(isFlying); | 2860 | AddToPhysicalScene(isFlying); |
| 2861 | } | 2861 | } |