diff options
| author | Melanie | 2012-10-26 21:47:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:47:41 +0100 |
| commit | f3f794a12292e2abfdaecaa68b87663f27619277 (patch) | |
| tree | 17db09a28875bd0da13112c9601ef140e5e96ebd /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Separate LSL's notion of the default anim from the actually playing anims. (diff) | |
| download | opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.zip opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.gz opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.bz2 opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -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 5be826d..870bd66 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3275,7 +3275,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3275 | cAgent.Anims = Animator.Animations.ToArray(); | 3275 | cAgent.Anims = Animator.Animations.ToArray(); |
| 3276 | } | 3276 | } |
| 3277 | catch { } | 3277 | catch { } |
| 3278 | cAgent.DefaultAnim = Animator.Animations.DefaultAnimation; | 3278 | cAgent.DefaultAnim = Animator.Animations.ImplicitDefaultAnimation; |
| 3279 | 3279 | ||
| 3280 | if (Scene.AttachmentsModule != null) | 3280 | if (Scene.AttachmentsModule != null) |
| 3281 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); | 3281 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); |