diff options
| author | callum <none@none> | 2009-10-15 11:29:14 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-15 11:29:14 -0700 |
| commit | 3831ca912eb8b78ccdcfac7d37c015ca45351c83 (patch) | |
| tree | 027137ca0b370bd41e178c192eae9659ff17e061 /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | 434709680326aa634805afdcf900b7445ef4aac4 (diff) | |
https://jira.lindenlab.com/jira/browse/DEV-40649
Media auto refreshes after Whitelist set
This checkin fixes a related issue to this task and prohibits user from (A) adding an item to the whitelist that would invalidate the home URL and (b) adding a home URL that would not pass the whitelist.
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index 5acfa39181..c404ad127f 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -63,6 +63,8 @@ public: void updateMediaPreview(); void updateCurrentURL(); + + const std::string getHomeUrl(); protected: LLFloaterMediaSettings* mParent; @@ -74,7 +76,6 @@ private: LLComboBox* mControls; LLCheckBoxCtrl* mAutoLoop; LLCheckBoxCtrl* mFirstClick; -// LLTextureCtrl* mMediaPreview; LLCheckBoxCtrl* mAutoZoom; LLCheckBoxCtrl* mAutoPlay; LLCheckBoxCtrl* mAutoScale; |