diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
| commit | 6abd41831a4cae5d757aa44675731d1fd48d64b1 (patch) | |
| tree | 6fc9de74e865a8337823b317a87b7c132bca0c7a /indra/newview/llfloaterpreference.h | |
| parent | bb04795eeb222e5396e24e79ac1f77b155bd4622 (diff) | |
| parent | 6b8ed2ae6f92d6f9559cbc86699b9ca3197f2e81 (diff) | |
automated merge viewer2.0->viewer2.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 74a53d673c..b2bc34231d 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -132,6 +132,7 @@ public: // void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator); void onCommitAutoDetectAspect(); + void onCommitParcelMediaAutoPlayEnable(); void applyResolution(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); void getUIColor(LLUICtrl* ctrl, const LLSD& param); |