diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-10-07 08:18:51 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-10-07 08:18:51 +0000 |
| commit | a99449bea167ba4710d7cc32a3961d0499bf6e09 (patch) | |
| tree | 968440270dfe97d6113e57a8c5ccef308966493b /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | 9f2f620cdfd722f9bc46dc378072f490001529e2 (diff) | |
DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by rick
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index 24678a3a07..527a6f5e3a 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -56,8 +56,8 @@ public: ~LLPanelMediaSettingsGeneral(); void setParent( LLFloaterMediaSettings* parent ); - static void initValues( void* userdata, const LLSD& media_settings ); - static void clearValues( void* userdata ); + static void initValues( void* userdata, const LLSD& media_settings ,bool editable); + static void clearValues( void* userdata, bool editable); void updateMediaPreview(); void updateCurrentURL(); @@ -74,7 +74,7 @@ private: LLComboBox* mControls; LLCheckBoxCtrl* mAutoLoop; LLCheckBoxCtrl* mFirstClick; - LLTextureCtrl* mMediaPreview; +// LLTextureCtrl* mMediaPreview; LLCheckBoxCtrl* mAutoZoom; LLCheckBoxCtrl* mAutoPlay; LLCheckBoxCtrl* mAutoScale; |