From f95922c27330b12ba22434203bf6955c06b74ba4 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 12 Oct 2011 10:08:14 -0700 Subject: Updated tooltip for "picks" to match the wiki. --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f19cfa19f2..04fc5c868c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3695,7 +3695,7 @@ Try enclosing path to the editor with double quotes. Show nearby people Moving your avatar Friends, groups, and nearby people - Favorite places + Places to show as favorites in your profile Places you've saved Preferences Edit or view your profile -- cgit v1.2.3 From 23a2a77369b9f4b4fb5e606dc962e5838fb44503 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 12 Oct 2011 15:39:40 -0700 Subject: added separator above navigation bar --- .../newview/skins/default/textures/navbar/separator.png | Bin 0 -> 2826 bytes indra/newview/skins/default/textures/textures.xml | 2 +- .../skins/default/xui/en/panel_navigation_bar.xml | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/navbar/separator.png (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/navbar/separator.png b/indra/newview/skins/default/textures/navbar/separator.png new file mode 100644 index 0000000000..b93e5791a7 Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/separator.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 27577d42ea..4f34352516 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -769,5 +769,5 @@ with the same filename but different name - + diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index bf9eeb6d26..ab6fa36e6c 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -43,6 +43,16 @@ top="0" height="34" width="600"/> + Date: Wed, 12 Oct 2011 15:46:45 -0700 Subject: EXP-1275 WIP A UI element or Keyboard shortcut to clear the viewport added confirmation dialog before hiding UI --- indra/newview/skins/default/xui/en/menu_viewer.xml | 14 +++++++------- indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index fdbc3d1882..c586e3a098 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -24,6 +24,13 @@ function="Floater.Toggle" parameter="toybox" /> + + + @@ -1719,13 +1726,6 @@ - - - + + + confirm + This action will hide all menu items and buttons. To get them back, click [SHORTCUT] again. + + + You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. -- cgit v1.2.3 From 45a316831636043663972bdf83adbefb345549de Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 12 Oct 2011 16:08:53 -0700 Subject: EXP-1337 FIX Add Confirmation dialog to "Restore Defaults" in the Toybox Reviewed by Leslie --- indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 1 file changed, 14 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 6b0ffd9d33..f510b3c5ba 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4622,6 +4622,20 @@ Are you sure you want to quit? yestext="Quit"/> + + +Are you sure you want to restore your default buttons and toolbars? + +You cannot undo this action. + + + Date: Wed, 12 Oct 2011 17:18:17 -0700 Subject: updating destination guide and avatar picker urls --- indra/newview/skins/default/xui/en/floater_avatar.xml | 2 +- indra/newview/skins/default/xui/en/floater_destinations.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml index 6e5c4ada48..3c7de6f334 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml @@ -5,7 +5,7 @@ can_close="true" can_resize="true" min_height="230" - min_width="445" + min_width="450" height="230" layout="topleft" name="Avatar" diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 2b48a9f6d6..e63dc02a57 100644 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -7,7 +7,7 @@ user_resize="true" can_resize="true" min_height="230" - min_width="525" + min_width="350" height="230" layout="topleft" name="Destinations" @@ -22,6 +22,5 @@ width="840" follows="all" name="destination_guide_contents" - start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html" trusted_content="true"/> -- cgit v1.2.3 From 309ebb84a8cf93e03e2594525aa128b3002040bf Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 12 Oct 2011 17:43:47 -0700 Subject: * Floater positioning now based on position of other cascading windows currently open. --- indra/newview/skins/default/xui/en/floater_camera.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_chat_bar.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_moveview.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 7f3abbb481..20d0fa1c91 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,14 +1,14 @@