From 16709a9bef3ebf24c60eac29f7c5cb743e855da1 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 18 Jul 2013 21:05:41 -0700 Subject: ACME-734 : WIP : Implemented changes for https URL in the address bar and added options to web floater to hide history and disable buttons --- indra/newview/llfloaterwebcontent.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llfloaterwebcontent.h') diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index cfc87e9015..b416328e93 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -54,6 +54,8 @@ public: id; Optional show_chrome, allow_address_entry, + allow_back_forward_navigation, + save_url_history, trusted_content, show_page_title; Optional preferred_media_size; @@ -97,6 +99,7 @@ protected: LLMediaCtrl* mWebBrowser; LLComboBox* mAddressCombo; LLIconCtrl* mSecureLockIcon; + LLTextBox* mSecurePrefix; LLTextBox* mStatusBarText; LLProgressBar* mStatusBarProgress; @@ -108,6 +111,8 @@ protected: std::string mCurrentURL; std::string mUUID; bool mShowPageTitle; + bool mAllowNavigation; + bool mSaveURLHistory; }; #endif // LL_LLFLOATERWEBCONTENT_H -- cgit v1.2.3 From 652ec2feeeb39c5c7ec9553563e3fdc29c66780d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 19 Jul 2013 17:47:58 -0700 Subject: ACME-734 : Suppress the green https experiment, prevent logging urls when skipping history, allow temporary url for display purposes --- indra/newview/llfloaterwebcontent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterwebcontent.h') diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index b416328e93..4d77537f5f 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -99,7 +99,6 @@ protected: LLMediaCtrl* mWebBrowser; LLComboBox* mAddressCombo; LLIconCtrl* mSecureLockIcon; - LLTextBox* mSecurePrefix; LLTextBox* mStatusBarText; LLProgressBar* mStatusBarProgress; @@ -109,6 +108,7 @@ protected: LLView* mBtnStop; std::string mCurrentURL; + std::string mDisplayURL; std::string mUUID; bool mShowPageTitle; bool mAllowNavigation; -- cgit v1.2.3 From eadb42eb9d202c38ca2761be07ee4376863550ce Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 19 Jul 2013 22:35:45 -0700 Subject: ACME-734 : Fix : Feed browsing history but without the query part --- indra/newview/llfloaterwebcontent.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llfloaterwebcontent.h') diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 4d77537f5f..9d6d28bce0 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -55,7 +55,6 @@ public: Optional show_chrome, allow_address_entry, allow_back_forward_navigation, - save_url_history, trusted_content, show_page_title; Optional preferred_media_size; @@ -112,7 +111,6 @@ protected: std::string mUUID; bool mShowPageTitle; bool mAllowNavigation; - bool mSaveURLHistory; }; #endif // LL_LLFLOATERWEBCONTENT_H -- cgit v1.2.3 From f44d24fafba7e8b9e8b5318602088a69d8da741c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Sun, 21 Jul 2013 13:02:55 -0700 Subject: ACME-734 : Fix : Factorize and clean up web browsing address, log and history code --- indra/newview/llfloaterwebcontent.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterwebcontent.h') diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 9d6d28bce0..5976474e0e 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -106,8 +106,8 @@ protected: LLView* mBtnReload; LLView* mBtnStop; - std::string mCurrentURL; - std::string mDisplayURL; + 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; -- cgit v1.2.3 From 6df15cb0908dab240e85b5db1433726ee09ad9bf Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 23 Jul 2013 15:31:36 -0700 Subject: ACME-734 : Fix issues with the lock icon when editing the address bar. Generalize the secure browsing UI. --- indra/newview/llfloaterwebcontent.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterwebcontent.h') diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 5976474e0e..f7e0db8d9e 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -111,6 +111,7 @@ protected: std::string mUUID; bool mShowPageTitle; bool mAllowNavigation; + bool mSecureURL; // true when the current url is prefixed "https://" }; #endif // LL_LLFLOATERWEBCONTENT_H -- cgit v1.2.3