diff options
| author | Tofu Buzzard <no-email> | 2011-02-04 21:11:33 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-04 21:11:33 -0800 |
| commit | 36feb9d5a467453763c1f4b41b1779ea711c410f (patch) | |
| tree | 5f82bb0c0ef1b8acd761ceb83f722f58c4668b20 /indra/newview/llfloaterpreference.h | |
| parent | 3c8e91c71673e02bc56b0322bb0ea8026a51d332 (diff) | |
| parent | 3f77074f27ed96ee817e00d026145942da9a1ecb (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 784033ae95..46014804ec 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -189,6 +189,10 @@ public: void setControlFalse(const LLSD& user_data); virtual void setHardwareDefaults(){}; + // Disables "Allow Media to auto play" check box only when both + // "Streaming Music" and "Media" are unchecked. Otherwise enables it. + void updateMediaAutoPlayCheckbox(LLUICtrl* ctrl); + // This function squirrels away the current values of the controls so that // cancel() can restore them. virtual void saveSettings(); |