diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 10:47:55 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 10:47:55 -0400 |
commit | 444bdef6d4949b6381b8706ab056588bc6bd88eb (patch) | |
tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/newview/llfloaterwebcontent.h | |
parent | af0be560002d4de4d9d89709b5d3b4cc1aef31fc (diff) | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
-rw-r--r-- | indra/newview/llfloaterwebcontent.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 36e214b7a9..6fc66d1ad8 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -53,7 +53,8 @@ public: id; Optional<bool> show_chrome, allow_address_entry, - trusted_content; + trusted_content, + show_page_title; Optional<LLRect> preferred_media_size; _Params(); @@ -91,13 +92,14 @@ protected: void open_media(const Params& ); void set_current_url(const std::string& url); - LLMediaCtrl* mWebBrowser; - LLComboBox* mAddressCombo; - LLIconCtrl *mSecureLockIcon; - LLTextBox* mStatusBarText; - LLProgressBar* mStatusBarProgress; - std::string mCurrentURL; - std::string mUUID; + LLMediaCtrl* mWebBrowser; + LLComboBox* mAddressCombo; + LLIconCtrl* mSecureLockIcon; + LLTextBox* mStatusBarText; + LLProgressBar* mStatusBarProgress; + std::string mCurrentURL; + std::string mUUID; + bool mShowPageTitle; }; #endif // LL_LLFLOATERWEBCONTENT_H |