diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 12:05:24 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 12:05:24 -0800 |
| commit | 3a707a1a69c44ccdbb819664d404ccc8d9716c28 (patch) | |
| tree | 6e7315a2611b36ffe193d3dc5a69298f9d920d2f /indra/newview/llfloaterpreference.h | |
| parent | 0e62cc934caf205d416ab5cd633522958a96e056 (diff) | |
| parent | 315c381d804ccad4039e193ebd0cdc1b8d2ddec1 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index b7ddc1fe64..6f382620ee 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -133,6 +133,7 @@ public: void onCommitAutoDetectAspect(); void onCommitParcelMediaAutoPlayEnable(); + void onCommitMediaEnabled(); void applyResolution(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); void getUIColor(LLUICtrl* ctrl, const LLSD& param); |