From 83633ddce761e1526c349b78efa43e466916feef Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 26 Oct 2011 11:54:19 -0700
Subject: Add ignore_ui_scale="false" flag to login page web browser for
 testing putposes

---
 indra/newview/skins/default/xui/en/panel_login.xml | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 1c3e08d59b..090c4e0d61 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -22,17 +22,18 @@ top="600"
 <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
 <web_browser
   tab_stop="false" 
-trusted_content="true" 
-bg_opaque_color="Black"
-border_visible="false"
-bottom="600"
-follows="all"
-left="0"
-name="login_html"
-start_url=""
-top="0"
-height="600"
-     width="980" />
+  trusted_content="true" 
+  bg_opaque_color="Black"
+  border_visible="false"
+  bottom="600"
+  follows="all"
+  left="0"
+  name="login_html"
+  start_url=""
+  top="0"
+  height="600"
+  width="980" 
+  ignore_ui_scale="false"/>
 <layout_stack
 follows="left|bottom|right"
 name="login_widgets"
-- 
cgit v1.2.3


From 40dcdac27ae5d11a6e3d6a13b1505e834f672e4d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 27 Oct 2011 13:37:47 -0700
Subject: remove ignore_ui_scale flags and use web content scaling for all
 web_browser widgets

---
 indra/newview/skins/default/xui/en/floater_buy_currency_html.xml | 1 -
 indra/newview/skins/default/xui/en/panel_login.xml               | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index b9c415633f..0637eedfb2 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -23,6 +23,5 @@
     right="-1" 
     top="1"
     bottom="-1" 
-    ignore_ui_scale="false"
     name="browser"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 090c4e0d61..e8f63afe1d 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -32,8 +32,7 @@ top="600"
   start_url=""
   top="0"
   height="600"
-  width="980" 
-  ignore_ui_scale="false"/>
+  width="980"/>
 <layout_stack
 follows="left|bottom|right"
 name="login_widgets"
-- 
cgit v1.2.3


From 2da4d944a71d3d7bd599baaedb5128cf873fc551 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 2 Nov 2011 10:40:02 -0700
Subject: EXP-1492 Avatar picker floater should be 4.5 thumbnails wide

---
 indra/newview/skins/default/xui/en/floater_avatar.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 2d973e7d90..6009821f7f 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -16,11 +16,11 @@
  save_rect="true"
  save_visibility="true"
  title="AVATAR PICKER"
- width="635">
+ width="700">
     <web_browser
       top="25"
       height="200"
-      width="635"
+      width="700"
       follows="all"
       name="avatar_picker_contents"
       trusted_content="true"/>
-- 
cgit v1.2.3