aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-26 22:26:45 +0000
committerTeravus Ovares2007-12-26 22:26:45 +0000
commit9f2fb5ba7048c5a9c234d3437e0b11c4970f9422 (patch)
treee88f5dea0f8849e1dfe54ff45d81cbcf80429d82 /OpenSim
parent* Patch from Charlie Omega for standard secondlife inventory folders: see man... (diff)
downloadopensim-SC_OLD-9f2fb5ba7048c5a9c234d3437e0b11c4970f9422.zip
opensim-SC_OLD-9f2fb5ba7048c5a9c234d3437e0b11c4970f9422.tar.gz
opensim-SC_OLD-9f2fb5ba7048c5a9c234d3437e0b11c4970f9422.tar.bz2
opensim-SC_OLD-9f2fb5ba7048c5a9c234d3437e0b11c4970f9422.tar.xz
* Play the 'landing' animation when landing and minimize the collision protection offset so the animations match up.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 03f1a70..4b8ca97 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -540,7 +540,8 @@ namespace OpenSim.Region.Environment.Scenes
540 // Add 1/2 the avatar's height to it's position so it doesn't shoot into the air 540 // Add 1/2 the avatar's height to it's position so it doesn't shoot into the air
541 // when the avatar stands up 541 // when the avatar stands up
542 542
543 AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight/2)); 543 AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight/6));
544 SetMovementAnimation(Animations.AnimsLLUUID["LAND"], 2);
544 SendFullUpdateToAllClients(); 545 SendFullUpdateToAllClients();
545 } 546 }
546 547