diff options
| author | Brian McBee | 2008-01-24 02:36:01 +0000 |
|---|---|---|
| committer | Brian McBee | 2008-01-24 02:36:01 +0000 |
| commit | 90b35beee7d6e6a3ffb9537fafc3f6c24ce20eed (patch) | |
| tree | 35ad71e136974c7d6f498b3315d889e6f37aab52 /OpenSim | |
| parent | * This update updates ODE to again use the AMotor to keep the avatar upright ... (diff) | |
| download | opensim-SC_OLD-90b35beee7d6e6a3ffb9537fafc3f6c24ce20eed.zip opensim-SC_OLD-90b35beee7d6e6a3ffb9537fafc3f6c24ce20eed.tar.gz opensim-SC_OLD-90b35beee7d6e6a3ffb9537fafc3f6c24ce20eed.tar.bz2 opensim-SC_OLD-90b35beee7d6e6a3ffb9537fafc3f6c24ce20eed.tar.xz | |
Another try at fixing the Animations problem on region crossing.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index f37b38b..06b4035 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -332,7 +332,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 332 | AbsolutePosition = m_controllingClient.StartPos; | 332 | AbsolutePosition = m_controllingClient.StartPos; |
| 333 | 333 | ||
| 334 | Animations = new AvatarAnimations(); | 334 | Animations = new AvatarAnimations(); |
| 335 | Animations.LoadAnims(); | 335 | lock (Animations) |
| 336 | { | ||
| 337 | Animations.LoadAnims(); | ||
| 338 | } | ||
| 336 | 339 | ||
| 337 | // TODO: m_animations and m_animationSeqs should always be of the same length. | 340 | // TODO: m_animations and m_animationSeqs should always be of the same length. |
| 338 | // Move them into an object to (hopefully) avoid threading issues. | 341 | // Move them into an object to (hopefully) avoid threading issues. |