diff options
| author | Jacek Antonelli | 2011-05-25 19:04:28 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-25 19:04:28 -0500 |
| commit | 67f25dd7397901028a6e2d74efa1f5d78c1ce26c (patch) | |
| tree | 4db5fcf6f677e209bdfc78f9044fe0a128f5f87b /linden/indra/newview/llprefsvoice.cpp | |
| parent | Merge remote-tracking branch 'thickbrick/remove_buggy_http_workaround' into next (diff) | |
| parent | Besides the numerous label and organizational changes, here are the main points (diff) | |
| download | meta-impy-67f25dd7397901028a6e2d74efa1f5d78c1ce26c.zip meta-impy-67f25dd7397901028a6e2d74efa1f5d78c1ce26c.tar.gz meta-impy-67f25dd7397901028a6e2d74efa1f5d78c1ce26c.tar.bz2 meta-impy-67f25dd7397901028a6e2d74efa1f5d78c1ce26c.tar.xz | |
Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into next
Diffstat (limited to 'linden/indra/newview/llprefsvoice.cpp')
| -rw-r--r-- | linden/indra/newview/llprefsvoice.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp index fe5446b..0e8e816 100644 --- a/linden/indra/newview/llprefsvoice.cpp +++ b/linden/indra/newview/llprefsvoice.cpp | |||
| @@ -189,6 +189,8 @@ void LLPrefsVoice::onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data) | |||
| 189 | self->childSetEnabled("push_to_talk_label", enable); | 189 | self->childSetEnabled("push_to_talk_label", enable); |
| 190 | self->childSetEnabled("voice_call_friends_only_check", enable); | 190 | self->childSetEnabled("voice_call_friends_only_check", enable); |
| 191 | self->childSetEnabled("auto_disengage_mic_check", enable); | 191 | self->childSetEnabled("auto_disengage_mic_check", enable); |
| 192 | self->childSetEnabled("privacy_heading", enable); | ||
| 193 | self->childSetEnabled("push_to_talk_heading", enable); | ||
| 192 | self->childSetEnabled("push_to_talk_toggle_check", enable); | 194 | self->childSetEnabled("push_to_talk_toggle_check", enable); |
| 193 | self->childSetEnabled("ear_location", enable); | 195 | self->childSetEnabled("ear_location", enable); |
| 194 | self->childSetEnabled("set_voice_hotkey_button", enable); | 196 | self->childSetEnabled("set_voice_hotkey_button", enable); |