diff options
| author | Don Kjer <don@lindenlab.com> | 2007-12-05 23:43:56 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-12-05 23:43:56 +0000 |
| commit | facf67ae3226105910c983a8fa8760414bf703e9 (patch) | |
| tree | b5f7cd6b79a79f769080a65b6fe2cb6b97c8b6fb /indra/newview/llstatusbar.cpp | |
| parent | 45057e8881c3166c7c0ef545c02bc177922af6fb (diff) | |
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 856943da6e..4d49d33184 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -375,7 +375,7 @@ void LLStatusBar::refresh() x += buttonRect.getWidth(); } - BOOL have_voice = gVoiceClient->getAreaVoiceDisabled() ? FALSE : TRUE; + BOOL have_voice = parcel && parcel->getVoiceEnabled(); childSetVisible("status_voice", have_voice); if (have_voice) { |