diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-01 16:55:00 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-01 16:55:00 +0200 |
| commit | 6a91f2b7f6b225f86849c9ebe53add6d2c8382a5 (patch) | |
| tree | b325606af8716c4ffe9f8d44dea13f47bcec1757 /indra/newview/llfloatermediasettings.h | |
| parent | cf3d40462e3c0421884a098505413c00f9004e6a (diff) | |
| parent | f893c39a4c92326d7ad08ee4bc79bcc611608ca9 (diff) | |
merge
--HG--
branch : product-engine
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; }; |