diff options
| author | simon <none@none> | 2013-10-24 16:45:38 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-24 16:45:38 -0700 |
| commit | 26de32910f99e2522b8e10cf41415b1af2586d5b (patch) | |
| tree | 57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/newview/llfloaterwebcontent.h | |
| parent | 93b3f1297ea5377257d14c5214790607e0b1af96 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Pull in viewer-release with fbc / snowstorm
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 86b5a5e00b..f22940cd07 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -55,6 +55,7 @@ public: id; Optional<bool> show_chrome, allow_address_entry, + allow_back_forward_navigation, trusted_content, show_page_title; Optional<LLRect> preferred_media_size; @@ -106,9 +107,12 @@ protected: LLView* mBtnReload; LLView* mBtnStop; - std::string mCurrentURL; + std::string mCurrentURL; // Current URL + std::string mDisplayURL; // URL being displayed in the address bar (can differ by trailing / leading space) std::string mUUID; bool mShowPageTitle; + bool mAllowNavigation; + bool mSecureURL; // true when the current url is prefixed "https://" }; #endif // LL_LLFLOATERWEBCONTENT_H |