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/lloverlaybar.cpp | |
| 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/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index a24d1ed54a..0eb96f992a 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -231,7 +231,7 @@ void LLOverlayBar::refresh() BOOL sitting = FALSE; if (gAgent.getAvatarObject()) { - sitting = gAgent.getAvatarObject()->mIsSitting; + sitting = gAgent.getAvatarObject()->isSitting(); } button = getChild<LLButton>("Stand Up"); |