diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
| commit | fa39ff67f081e2e957d2ba7fd9f014747ff10963 (patch) | |
| tree | dc67779842f2a670e5c242c07e24d27ec701f8d5 /indra/newview/llpanelvolumepulldown.cpp | |
| parent | 2076f4af0fc946c3bd79754a1deefc495ee7edb9 (diff) | |
| parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) | |
Merge branch 'master' into DRTVWR-497
Diffstat (limited to 'indra/newview/llpanelvolumepulldown.cpp')
| -rw-r--r-- | indra/newview/llpanelvolumepulldown.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp index 6792137350..f063d84272 100644 --- a/indra/newview/llpanelvolumepulldown.cpp +++ b/indra/newview/llpanelvolumepulldown.cpp @@ -140,7 +140,7 @@ void LLPanelVolumePulldown::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl) bool music_enabled = getChild<LLCheckBoxCtrl>("enable_music")->get(); bool media_enabled = getChild<LLCheckBoxCtrl>("enable_media")->get(); - getChild<LLCheckBoxCtrl>("media_auto_play_btn")->setEnabled(music_enabled || media_enabled); + getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled); } } |