diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-03 22:25:48 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-03 22:25:48 +0000 |
| commit | db5cda26676f376f18816013c0c5e3fbad5b20d0 (patch) | |
| tree | b50e52262d34f55b4eaf35a3a1952007ef0a69de /indra/newview/llagent.h | |
| parent | 3c85899ee0db4a90d03ec687e514a31c1befe34e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index e25bb0a578..0b1ff2e76b 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -374,6 +374,12 @@ private: bool mbRunning; // Is the avatar trying to run right now? //-------------------------------------------------------------------- + // Sit and stand + //-------------------------------------------------------------------- +public: + void standUp(); + + //-------------------------------------------------------------------- // Busy //-------------------------------------------------------------------- public: |