diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:05 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:05 -0700 |
| commit | ea1c3218e2ca70623ef348dcae36d667e095394f (patch) | |
| tree | 30bccfb5de1278c0e085863e3231684b25083c23 /indra/newview/llagent.cpp | |
| parent | 2bf9acabfb534821e5302848860ef6a01af23b1b (diff) | |
EXP-1411 FIX "Speak" button enabled in regions with disabled voice
EXP-1424 FIX Floaters open on top of one another in default position with no offset
floaters now stack with their own kind preferentially
Diffstat (limited to 'indra/newview/llagent.cpp')
| -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; } |