aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-08-12 21:38:52 +0000
committerJeff Ames2008-08-12 21:38:52 +0000
commitc65415d320501771920982523243102f1436c170 (patch)
treeac363a57b4248af0f911376289c40d17f74195f2 /OpenSim
parent* Stop warnings about non existent scene presences/entities being removed on ... (diff)
downloadopensim-SC_OLD-c65415d320501771920982523243102f1436c170.zip
opensim-SC_OLD-c65415d320501771920982523243102f1436c170.tar.gz
opensim-SC_OLD-c65415d320501771920982523243102f1436c170.tar.bz2
opensim-SC_OLD-c65415d320501771920982523243102f1436c170.tar.xz
Thanks HomerHorwitz for a patch to enable the Stand Up button when sitting on the ground. (bug #1932)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5c90bf3..342fd03 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -887,9 +887,11 @@ namespace OpenSim.Region.Environment.Scenes
887 887
888 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0) 888 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
889 { 889 {
890 // TODO: This doesn't enable the "stand up" button on the viewer yet (probably a parent ID problem) 890 // TODO: This doesn't prevent the user from walking yet.
891 // m_parentID = ??? 891 // Setting parent ID would fix this, if we knew what value
892 TrySetMovementAnimation("SIT_GROUND"); 892 // to use. Or we could add a m_isSitting variable.
893
894 TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
893 } 895 }
894 // In the future, these values might need to go global. 896 // In the future, these values might need to go global.
895 // Here's where you get them. 897 // Here's where you get them.