diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-03 14:09:02 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-03 14:09:02 -0800 |
| commit | e82fb8c7b90c0f5038c38a1aaf4882718433bfd6 (patch) | |
| tree | 1c017c4ddd57d5dd5a951999aca856bb81caa651 /indra/newview/llfloaterpreference.h | |
| parent | 3feb97487a6330080f6278f01e5d26dad0196d77 (diff) | |
| parent | c07c6cf8f4979a3374a09cec12e92df619ffd501 (diff) | |
STORM-513 : pull into viewer-development
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(); |