From 0da8fb6035f69399468f0085cd967f90efa91c40 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Fri, 9 Apr 2010 09:26:31 -0400 Subject: Change comment that wasn't updated with the code. No functionality changes. --- indra/newview/lllogininstance.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 24c72c65ce..454fd29fdc 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -352,20 +352,18 @@ void LLLoginInstance::updateApp(bool mandatory, const std::string& auth_msg) payload["mandatory"] = mandatory; /* - We're constructing one of the following 6 strings here: + We're constructing one of the following 9 strings here: "DownloadWindowsMandatory" "DownloadWindowsReleaseForDownload" "DownloadWindows" "DownloadMacMandatory" "DownloadMacReleaseForDownload" "DownloadMac" + "DownloadLinuxMandatory" + "DownloadLinuxReleaseForDownload" + "DownloadLinux" I've called them out explicitly in this comment so that they can be grepped for. - - Also, we assume that if we're not Windows we're Mac. If we ever intend to support - Linux with autoupdate, this should be an explicit #elif LL_DARWIN, but - we'd rather deliver the wrong message than no message, so until Linux is supported - we'll leave it alone. */ std::string notification_name = "Download"; -- cgit v1.2.3 From 469e06f8afc124fcd6a627b9c2478b8668bfd812 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 9 Apr 2010 13:11:21 -0700 Subject: EXT-6796 - selecting emote in animation upload preview doesn't do anything reviewed by Mani --- .../default/xui/en/floater_animation_preview.xml | 152 ++++++++++++--------- .../skins/default/xui/en/floater_image_preview.xml | 30 ++-- 2 files changed, 108 insertions(+), 74 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 9dff4abe2c..cb6b2f6ebc 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -333,66 +333,86 @@ Maximum animation length is [MAX_LENGTH] seconds. left_pad="20" name="emote_combo" tool_tip="Controls what face does during animation"> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - Date: Fri, 9 Apr 2010 18:37:14 -0700 Subject: VWR-17819 removing old param overrides --- .../skins/default/xui/es/floater_inventory_view_finder.xml | 6 +++--- .../skins/default/xui/fr/floater_inventory_view_finder.xml | 10 +++++----- .../skins/default/xui/it/floater_inventory_view_finder.xml | 2 +- .../skins/default/xui/pt/floater_inventory_view_finder.xml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml index 36e7e40e59..c9d639d8cf 100644 --- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml @@ -11,9 +11,9 @@ -