diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:26 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:26 -0700 |
| commit | f66b028e908b1f8118b383e98ff8263096d5d1e0 (patch) | |
| tree | 9b402418d85d64ae250520d900c103507da07b11 /indra/newview | |
| parent | 6d546f1fc3386a05a06c5b1a0ea9e84506380bb1 (diff) | |
| parent | ea1c3218e2ca70623ef348dcae36d667e095394f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 1f0a9252c8..21cb3380c9 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -175,7 +175,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname) } else if (param == "speak") { - if ( gAgent.isVoiceConnected() ) + if ( gAgent.isVoiceConnected() && LLViewerParcelMgr::getInstance()->allowAgentVoice() ) { retval = true; } |