summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermediasettings.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatermediasettings.h')
-rw-r--r--indra/newview/llfloatermediasettings.h9
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*);