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/llfloatermediasettings.h | |
| parent | 9f2f620cdfd722f9bc46dc378072f490001529e2 (diff) | |
DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by rick
Diffstat (limited to 'indra/newview/llfloatermediasettings.h')
| -rw-r--r-- | indra/newview/llfloatermediasettings.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h index b95c590346..10dc31b4f9 100644 --- a/indra/newview/llfloatermediasettings.h +++ b/indra/newview/llfloatermediasettings.h @@ -50,11 +50,15 @@ public: virtual BOOL postBuild(); static LLFloaterMediaSettings* getInstance(); static void apply(); - static void initValues( const LLSD& media_settings ); - static void clearValues(); + static void initValues( const LLSD& media_settings , bool editable); + static void clearValues( bool editable); void enableOkApplyBtns( bool enable ); LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;}; + bool mIdenticalHasMediaInfo; + bool mMultipleMedia; + bool mMultipleValidMedia; + protected: LLButton *mOKBtn; LLButton *mCancelBtn; @@ -65,6 +69,7 @@ protected: LLPanelMediaSettingsSecurity* mPanelMediaSettingsSecurity; LLPanelMediaSettingsPermissions* mPanelMediaSettingsPermissions; + void onClose(); static void onBtnOK(void*); static void onBtnCancel(void*); |