diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-02 11:29:03 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-02 11:29:03 -0500 |
| commit | c40ed43535164c3b80afd34bdb1de211eb023458 (patch) | |
| tree | 3722435d89e460d046c3355d76dd106052efb61f /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | 5642d7d0122da91d8ef23f8adb069cc82e0c4ed4 (diff) | |
| parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) | |
merging in viewer-2 into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index f8b8f0d224..7782b25d63 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -42,6 +42,7 @@ class LLLineEditor; class LLSpinCtrl; class LLTextureCtrl; class LLMediaCtrl; +class LLTextBox; class LLFloaterMediaSettings; class LLPanelMediaSettingsGeneral : public LLPanel @@ -87,6 +88,8 @@ private: static bool isMultiple(); + void checkHomeUrlPassesWhitelist(); + LLComboBox* mControls; LLCheckBoxCtrl* mAutoLoop; LLCheckBoxCtrl* mFirstClick; @@ -98,6 +101,7 @@ private: LLLineEditor* mHomeURL; LLLineEditor* mCurrentURL; LLMediaCtrl* mPreviewMedia; + LLTextBox* mFailWhiteListText; }; #endif // LL_LLPANELMEDIAMEDIASETTINGSGENERAL_H |