From fe71dd340ab396b93bde45df438041af5d85fd47 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 1 Feb 2010 15:10:19 -0800 Subject: Merge giab-viewer-trunk 2497, general merge of more secapi stuff as well as certificate handling stuff. Grid manager as well --- indra/newview/skins/default/xui/en/panel_login.xml | 55 +++++++--------------- 1 file changed, 17 insertions(+), 38 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 6187b8f1e2..6b6013a6ee 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -47,19 +47,19 @@ auto_resize="false" follows="left|bottom" name="login" layout="topleft" -width="695" -min_width="695" +width="775" +min_width="775" user_resize="false" height="80"> -First name: +Username: - - Last name: - +width="150" /> - + + width="307"> + width="307" /> + width="307" /> + @@ -377,7 +434,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t height="23" layout="topleft" left="8" - top_pad="0" + top_pad="4" name="button_bar" width="313"> - + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index c74de043e9..44c44f5f59 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -9,33 +9,6 @@ name="Display panel" top="1" width="517"> - - UI size: - - Quality and speed: diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 2123e62daa..8d7b40b386 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -9,18 +9,6 @@ name="Input panel" top="1" width="517"> - Mouselook: -- cgit v1.2.3 From 8a22ffa622912f21908b35335e5fdb21e0596a14 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 1 Apr 2010 15:12:20 -0700 Subject: EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center placement, empty titlebar) reviewed by Richard CC#176 --- .../newview/skins/default/xui/en/notifications.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c39a91281e..f52996724f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2023,6 +2023,28 @@ Would you be my friend? + + Save what I'm wearing as a new Outfit: +
+ + [DESC] (new) + +