From b510bfd88e6b290930d9f19b3d16e7b58d7967be Mon Sep 17 00:00:00 2001 From: Erica Date: Wed, 3 Feb 2010 14:08:19 -0800 Subject: EXT-3648 New message indicator on IM chiclets should be orange --- .../default/textures/bottomtray/Unread_Chiclet.png | Bin 328 -> 334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png index 6343ddf035..e8fe243dc7 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png and b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png differ -- cgit v1.2.3 From 4f98a16736a44d2eeceab4a18160015054345858 Mon Sep 17 00:00:00 2001 From: Chuck Linden Date: Wed, 3 Feb 2010 17:29:10 -0500 Subject: Changed the "inspect" highlight color to teal to differentiate it from the "edit" color (and make it less obnoxious). https://jira.secondlife.com/browse/EXT-2578 --- indra/newview/skins/default/colors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index ec196245a1..ca579616d8 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -290,7 +290,7 @@ reference="Black" /> + reference="EmphasisColor" /> @@ -602,7 +602,7 @@ value="0.39 0.39 0.39 1" /> + reference="Red" /> -- cgit v1.2.3 From 554c163baf5bee0d62082338e854468ecb2fc5f1 Mon Sep 17 00:00:00 2001 From: Lis Linden Date: Wed, 3 Feb 2010 17:51:33 -0500 Subject: EXT-1268 'Remember me' is misleading --- indra/newview/skins/default/xui/en/panel_login.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index c04414abbb..627e616af5 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -118,7 +118,7 @@ control_name="RememberPassword" follows="left|bottom" font="SansSerifSmall" height="16" -label="Remember" +label="Remember password" top_pad="3" name="remember_check" width="135" /> -- cgit v1.2.3 From da19bed9a816a396fbc359803bd6a7f88bf8b6ae Mon Sep 17 00:00:00 2001 From: Soft Linden Date: Wed, 3 Feb 2010 17:04:44 -0600 Subject: EXT-1560 VWR-11118 DEV-27362 Ctrl+Alt+Shift+H doesn't say hippos! anymore --- indra/newview/llviewermenu.cpp | 8 ++++++++ indra/newview/llviewerwindow.cpp | 6 ++++++ indra/newview/llviewerwindow.h | 1 + indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ++++++++++++ indra/newview/skins/default/xui/en/strings.xml | 3 --- 5 files changed, 27 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f7f30a5136..0d6e490faa 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -603,6 +603,10 @@ class LLAdvancedToggleHUDInfo : public view_listener_t { gDisplayFOV = !(gDisplayFOV); } + else if ("badge" == info_type) + { + gDisplayBadge = !(gDisplayBadge); + } return true; } }; @@ -625,6 +629,10 @@ class LLAdvancedCheckHUDInfo : public view_listener_t { new_value = gDisplayFOV; } + else if ("badge" == info_type) + { + new_value = gDisplayBadge; + } return new_value; } }; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index fdc6675db1..315b7c52cf 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -233,6 +233,7 @@ S32 gDebugRaycastFaceHit; BOOL gDisplayWindInfo = FALSE; BOOL gDisplayCameraPos = FALSE; BOOL gDisplayFOV = FALSE; +BOOL gDisplayBadge = FALSE; S32 CHAT_BAR_HEIGHT = 28; S32 OVERLAY_BAR_HEIGHT = 20; @@ -422,6 +423,11 @@ public: addText(xpos, ypos, llformat("FOV: %2.1f deg", RAD_TO_DEG * LLViewerCamera::getInstance()->getView())); ypos += y_inc; } + if (gDisplayBadge) + { + addText(xpos, ypos+(y_inc/2), llformat("Hippos!", RAD_TO_DEG * LLViewerCamera::getInstance()->getView())); + ypos += y_inc * 2; + } /*if (LLViewerJoystick::getInstance()->getOverrideCamera()) { diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 98d2958d9a..bfce65f2ba 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -506,5 +506,6 @@ extern S32 CHAT_BAR_HEIGHT; extern BOOL gDisplayCameraPos; extern BOOL gDisplayWindInfo; extern BOOL gDisplayFOV; +extern BOOL gDisplayBadge; #endif diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7a4f63bfe4..22f4d277a4 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1998,6 +1998,18 @@ function="Advanced.ToggleHUDInfo" parameter="fov" /> + + + + (multiple) - - (hippos) - (none) -- cgit v1.2.3