diff options
| author | ubit | 2012-06-04 21:38:40 +0200 |
|---|---|---|
| committer | ubit | 2012-06-04 21:38:40 +0200 |
| commit | b0f6c9330ac348850448124312f5c675fedc08f5 (patch) | |
| tree | a5255387b7fa718a5879682b7384083ca92271d9 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | fix addforce/impulse. (diff) | |
| download | opensim-SC-b0f6c9330ac348850448124312f5c675fedc08f5.zip opensim-SC-b0f6c9330ac348850448124312f5c675fedc08f5.tar.gz opensim-SC-b0f6c9330ac348850448124312f5c675fedc08f5.tar.bz2 opensim-SC-b0f6c9330ac348850448124312f5c675fedc08f5.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
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 e2f32dd..2b1fb3d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -867,7 +867,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 867 | 867 | ||
| 868 | IsChildAgent = false; | 868 | IsChildAgent = false; |
| 869 | 869 | ||
| 870 | Animator.TrySetMovementAnimation("SIT"); | 870 | // Animator.TrySetMovementAnimation("SIT"); |
| 871 | } | 871 | } |
| 872 | else | 872 | else |
| 873 | { | 873 | { |