diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 16:01:34 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 16:01:34 -0800 |
| commit | b9de2b2572f20e441fff4a0c4e757d409eac32d4 (patch) | |
| tree | 81fae667784a135fe72c1c36187c8a674b8b8765 /indra/newview/llfloatermediasettings.h | |
| parent | 6223485bfafb9343f4e352014dec7f53717bcb47 (diff) | |
| parent | 5040a726755939704a3de14187d9d020caea4d9d (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloatermediasettings.h')
| -rw-r--r-- | indra/newview/llfloatermediasettings.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h index 17a47cb0f5..e2af1705bf 100644 --- a/indra/newview/llfloatermediasettings.h +++ b/indra/newview/llfloatermediasettings.h @@ -54,11 +54,13 @@ public: static void apply(); static void initValues( const LLSD& media_settings , bool editable); static void clearValues( bool editable); - void enableOkApplyBtns( bool enable ); - LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;}; - const std::string getHomeUrl(); + + LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;}; + const std::string getHomeUrl(); bool passesWhiteList( const std::string& test_url ); + virtual void draw(); + bool mIdenticalHasMediaInfo; bool mMultipleMedia; bool mMultipleValidMedia; @@ -83,6 +85,10 @@ protected: static LLFloaterMediaSettings* sInstance; private: + + void enableOkApplyBtns( bool enable ); + + LLSD mInitialValues; bool mWaitingToClose; }; |