diff options
| author | Jeff Ames | 2007-11-13 13:47:03 +0000 |
|---|---|---|
| committer | Jeff Ames | 2007-11-13 13:47:03 +0000 |
| commit | ae4312a6983b0e7453ba311e59629fdb8fdc7420 (patch) | |
| tree | c9faeb91d56d69c99f26a8f93d77e32abea2b2ef /OpenSim/Region/Environment/Scenes | |
| parent | Some work on cleanly removing Regions. (diff) | |
| download | opensim-SC-ae4312a6983b0e7453ba311e59629fdb8fdc7420.zip opensim-SC-ae4312a6983b0e7453ba311e59629fdb8fdc7420.tar.gz opensim-SC-ae4312a6983b0e7453ba311e59629fdb8fdc7420.tar.bz2 opensim-SC-ae4312a6983b0e7453ba311e59629fdb8fdc7420.tar.xz | |
replaced exception when sitting and typing with rather amusing getting up and sitting back down animation
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index cfa4ffe..20ec72e 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -703,6 +703,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 703 | } | 703 | } |
| 704 | } | 704 | } |
| 705 | } | 705 | } |
| 706 | else if (m_parentID != 0) | ||
| 707 | { | ||
| 708 | if (m_isTyping) | ||
| 709 | { | ||
| 710 | SendAnimPack(Animations.AnimsLLUUID["TYPE"], 1); | ||
| 711 | } | ||
| 712 | else | ||
| 713 | { | ||
| 714 | // TODO: stop the typing animation, continue sitting | ||
| 715 | SendAnimPack(Animations.AnimsLLUUID["SIT"], 1); | ||
| 716 | } | ||
| 717 | } | ||
| 706 | else | 718 | else |
| 707 | { | 719 | { |
| 708 | if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && | 720 | if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && |