diff options
| author | Melanie | 2011-11-14 20:03:47 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-14 20:03:47 +0000 |
| commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
| tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | minor: remove some mono compiler warnings (diff) | |
| download | opensim-SC-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 087697f..8906c6f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2862,6 +2862,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2862 | Velocity = Vector3.Zero; | 2862 | Velocity = Vector3.Zero; |
| 2863 | AbsolutePosition = pos; | 2863 | AbsolutePosition = pos; |
| 2864 | 2864 | ||
| 2865 | // m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); | ||
| 2866 | |||
| 2865 | AddToPhysicalScene(isFlying); | 2867 | AddToPhysicalScene(isFlying); |
| 2866 | } | 2868 | } |
| 2867 | } | 2869 | } |