diff options
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
-rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index 24678a3a07..5acfa39181 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -48,7 +48,9 @@ class LLPanelMediaSettingsGeneral : public LLPanel { public: BOOL postBuild(); - virtual void draw(); + /*virtual*/ void draw(); + /*virtual*/ void onClose(bool app_quitting); + static void apply(void*); void getValues(LLSD &fill_me_in); @@ -56,14 +58,12 @@ 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(); - void onClose(); - protected: LLFloaterMediaSettings* mParent; @@ -74,7 +74,7 @@ private: LLComboBox* mControls; LLCheckBoxCtrl* mAutoLoop; LLCheckBoxCtrl* mFirstClick; - LLTextureCtrl* mMediaPreview; +// LLTextureCtrl* mMediaPreview; LLCheckBoxCtrl* mAutoZoom; LLCheckBoxCtrl* mAutoPlay; LLCheckBoxCtrl* mAutoScale; |