diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
| commit | 3609eabe5460023d1460664feb5de10d68457725 (patch) | |
| tree | 533d03aadf36730eb59c2627cfd09e35593dd03c /indra/newview/llagent.cpp | |
| parent | 3191a5ddc9b3512b79a8505072d13583eb9012c6 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 483cb819c1..ef1d7974d6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -743,7 +743,7 @@ BOOL LLAgent::getFlying() const //----------------------------------------------------------------------------- // setFlying() //----------------------------------------------------------------------------- -void LLAgent::setFlying(BOOL fly) +void LLAgent::setFlying(BOOL fly, BOOL fail_sound) { if (isAgentAvatarValid()) { @@ -772,7 +772,10 @@ void LLAgent::setFlying(BOOL fly) // parcel doesn't let you start fly // gods can always fly // and it's OK if you're already flying + if (fail_sound) + { make_ui_sound("UISndBadKeystroke"); + } return; } if( !was_flying ) |