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

---
 .../skins/default/xui/en/floater_web_content.xml     | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index cea10adca8..a1563dc9ae 100755
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -125,14 +125,30 @@
       <icon
         name="media_secure_lock_flag"
         height="16"
-        follows="top|right"
+        follows="top|left"
         image_name="Lock2"
         layout="topleft"
-        left_delta="620"
+        left_delta="2"
         top_delta="2"
         visible="false" 
         tool_tip="Secured Browsing"
         width="16" />
+      <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         font.size="Small"
+         height="16"
+         layout="topleft"
+         left_delta="18"
+         name="secured_prefix"
+         top_delta="3"
+         text_color="EmphasisColor"
+         visible="false"
+         width="100">
+        https
+      </text>
       <button
         image_overlay="ExternalBrowser_Off"
 		    image_disabled="PushButton_Disabled"
-- 
cgit v1.2.3


From 652ec2feeeb39c5c7ec9553563e3fdc29c66780d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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

---
 .../newview/skins/default/xui/en/floater_web_content.xml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index a1563dc9ae..a80440e844 100755
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -133,22 +133,6 @@
         visible="false" 
         tool_tip="Secured Browsing"
         width="16" />
-      <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         font.size="Small"
-         height="16"
-         layout="topleft"
-         left_delta="18"
-         name="secured_prefix"
-         top_delta="3"
-         text_color="EmphasisColor"
-         visible="false"
-         width="100">
-        https
-      </text>
       <button
         image_overlay="ExternalBrowser_Off"
 		    image_disabled="PushButton_Disabled"
-- 
cgit v1.2.3