diff options
| author | Diva Canto | 2009-09-18 19:17:02 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-18 19:17:02 -0700 |
| commit | 4a55ff88c088ac0019a1106d97a8b8dd173c8cff (patch) | |
| tree | aa91fe204048d6f050cffca83168aec61f76a9a2 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | First pass at the grid service. (diff) | |
| parent | correct off-by-one error in save iar command handling (diff) | |
| download | opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.zip opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.gz opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.bz2 opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.xz | |
Merge branch 'master' of ssh://diva@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 23fe2d3..6772f75 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2269,7 +2269,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2269 | { | 2269 | { |
| 2270 | //Record the time we enter this state so we know whether to "land" or not | 2270 | //Record the time we enter this state so we know whether to "land" or not |
| 2271 | m_animPersistUntil = DateTime.Now.Ticks; | 2271 | m_animPersistUntil = DateTime.Now.Ticks; |
| 2272 | return "FALLDOWN"; | 2272 | return "FALLDOWN"; // this falling animation is invoked too frequently when capsule tilt correction is used - why? |
| 2273 | } | 2273 | } |
| 2274 | } | 2274 | } |
| 2275 | } | 2275 | } |