From 16709a9bef3ebf24c60eac29f7c5cb743e855da1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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<bool>			show_chrome,
 								allow_address_entry,
+                                allow_back_forward_navigation,
+                                save_url_history,
 								trusted_content,
 								show_page_title;
 		Optional<LLRect>		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