summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-07-18 21:05:41 -0700
committerMerov Linden <merov@lindenlab.com>2013-07-18 21:05:41 -0700
commit16709a9bef3ebf24c60eac29f7c5cb743e855da1 (patch)
tree0f050de27aa62b71c7b5b901c9cf96fc550a965d /indra/newview/skins/default/xui/en
parent883fca9d5a7c5db10f100b05b5312818233e342c (diff)
ACME-734 : WIP : Implemented changes for https URL in the address bar and added options to web floater to hide history and disable buttons
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_web_content.xml20
1 files changed, 18 insertions, 2 deletions
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"