diff options
| author | Melanie | 2012-06-02 02:01:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-02 02:01:48 +0100 |
| commit | 8e735efff0849c45dd24ae15dfdf34f7959701c5 (patch) | |
| tree | 55b5f15068782e2dba04deb4d0e8b1ff90140cba /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix LSL animation state reporting and animation state transitions on crossing (diff) | |
| download | opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.zip opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.gz opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.bz2 opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 07b36b3..33a17db 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -875,7 +875,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 875 | 875 | ||
| 876 | IsChildAgent = false; | 876 | IsChildAgent = false; |
| 877 | 877 | ||
| 878 | Animator.TrySetMovementAnimation("SIT"); | 878 | // Animator.TrySetMovementAnimation("SIT"); |
| 879 | } | 879 | } |
| 880 | else | 880 | else |
| 881 | { | 881 | { |