diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 15:49:42 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 15:49:42 -0700 |
| commit | ccedada68154205eaab78e4bb188f7bebaa1e686 (patch) | |
| tree | 35e57503963e22d3155734b99be9b8375e88d671 /indra/newview/llfloaterwebcontent.h | |
| parent | 827553f314d411c489bd99048181be5f5ff16d89 (diff) | |
| parent | f44d24fafba7e8b9e8b5318602088a69d8da741c (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index cfc87e9015..5976474e0e 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -54,6 +54,7 @@ public: id; Optional<bool> show_chrome, allow_address_entry, + allow_back_forward_navigation, trusted_content, show_page_title; Optional<LLRect> preferred_media_size; @@ -105,9 +106,11 @@ 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; }; #endif // LL_LLFLOATERWEBCONTENT_H |