From aec50ffdad0705e01e14a66b83683f8947c8e02a Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 2 Aug 2013 20:12:55 +0300
Subject: MAINT-2902 FIXED Browser secure session indicator should be prominent

---
 indra/llui/llcombobox.cpp                                  | 7 +++++++
 indra/llui/llcombobox.h                                    | 2 ++
 indra/newview/llfloaterwebcontent.cpp                      | 2 ++
 indra/newview/skins/default/xui/en/floater_web_content.xml | 5 ++---
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index d4e14d9419..56be52f69a 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -534,6 +534,13 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p)
 	}
 }
 
+void LLComboBox::setLeftTextPadding(S32 pad)
+{
+	S32 left_pad, right_pad;
+	mTextEntry->getTextPadding(&left_pad, &right_pad);
+	mTextEntry->setTextPadding(pad, right_pad);
+}
+
 void* LLComboBox::getCurrentUserdata()
 {
 	LLScrollListItem* item = mList->getFirstSelected();
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 64dbaea306..1e04fb0866 100755
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -190,6 +190,8 @@ public:
 	virtual BOOL	operateOnAll(EOperation op);
 
 	//========================================================================
+
+	void			setLeftTextPadding(S32 pad);
 	
 	void*			getCurrentUserdata();
 
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 3fe2518de6..c8b48ea6ca 100755
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -350,10 +350,12 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		if(test_prefix == prefix)
 		{
 			mSecureLockIcon->setVisible(true);
+			mAddressCombo->setLeftTextPadding(22);
 		}
 		else
 		{
 			mSecureLockIcon->setVisible(false);
+			mAddressCombo->setLeftTextPadding(2);
 		}
 	}
 	else if(event == MEDIA_EVENT_CLOSE_REQUEST)
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..4ba056f904 100755
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -125,11 +125,10 @@
       <icon
         name="media_secure_lock_flag"
         height="16"
-        follows="top|right"
         image_name="Lock2"
         layout="topleft"
-        left_delta="620"
-        top_delta="2"
+        left_delta="4"
+        top="2"
         visible="false" 
         tool_tip="Secured Browsing"
         width="16" />
-- 
cgit v1.2.3