diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
| commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
| tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llfloatermediasettings.h | |
| parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
| parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) | |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatermediasettings.h')
| -rw-r--r-- | indra/newview/llfloatermediasettings.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h index e2af1705bf..b72e3d855d 100644 --- a/indra/newview/llfloatermediasettings.h +++ b/indra/newview/llfloatermediasettings.h @@ -57,7 +57,7 @@ public: LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;}; const std::string getHomeUrl(); - bool passesWhiteList( const std::string& test_url ); + //bool passesWhiteList( const std::string& test_url ); virtual void draw(); @@ -75,7 +75,6 @@ protected: LLPanelMediaSettingsSecurity* mPanelMediaSettingsSecurity; LLPanelMediaSettingsPermissions* mPanelMediaSettingsPermissions; - static void onBtnOK(void*); static void onBtnCancel(void*); static void onBtnApply(void*); |