From 98a4d472bed18e11d71631e7c0cc9abd29b9a5d2 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Wed, 3 Feb 2010 13:44:13 +0000 Subject: EXT-4898: Changed English language code to "en" on Mac. Now LLUI::getLanguage() returns a result that is consistent on Mac, Windows, and Linux. Also, cleaned up some legacy language code. --- indra/newview/English.lproj/language.txt | 2 +- indra/newview/llmediactrl.cpp | 4 ++-- indra/newview/llviewermenu.cpp | 20 +------------------- 3 files changed, 4 insertions(+), 22 deletions(-) (limited to 'indra') diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt index bc0aa577f9..2c4c454fdd 100644 --- a/indra/newview/English.lproj/language.txt +++ b/indra/newview/English.lproj/language.txt @@ -1 +1 @@ -en-us \ No newline at end of file +en \ No newline at end of file diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index d464862eed..3c34d26692 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -542,9 +542,9 @@ void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::str if (! gDirUtilp->fileExists(expanded_filename)) { - if (language != "en-us") + if (language != "en") { - expanded_filename = gDirUtilp->findSkinnedFilename("html", "en-us", filename); + expanded_filename = gDirUtilp->findSkinnedFilename("html", "en", filename); if (! gDirUtilp->fileExists(expanded_filename)) { llwarns << "File " << subdir << delim << filename_in << "not found" << llendl; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f7f30a5136..3e23ac4a1c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7179,25 +7179,7 @@ void handle_buy_currency_test(void*) LLStringUtil::format_map_t replace; replace["[AGENT_ID]"] = gAgent.getID().asString(); replace["[SESSION_ID]"] = gAgent.getSecureSessionID().asString(); - - // *TODO: Replace with call to LLUI::getLanguage() after windows-setup - // branch merges in. JC - std::string language = "en"; - language = gSavedSettings.getString("Language"); - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("InstallLanguage"); - } - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("SystemLanguage"); - } - if (language.empty() || language == "default") - { - language = "en"; - } - - replace["[LANGUAGE]"] = language; + replace["[LANGUAGE]"] = LLUI::getLanguage(); LLStringUtil::format(url, replace); llinfos << "buy currency url " << url << llendl; -- 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') 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 From fea3e5ea7659bcefb6715bd87affdece2b4407fb Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 3 Feb 2010 15:13:19 -0800 Subject: Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin" Reviewed by Rick. --- indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index dbc44c8334..26690f64a6 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -724,8 +724,8 @@ private: return false; // allocate some space and grab it - UInt8* item_data = new UInt8( size + 1 ); - memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) ); + UInt8* item_data = new UInt8[ size + 1 ]; + memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) ); result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL ); if ( noErr != result ) { -- cgit v1.2.3 From 9c608d4db5909ffe2a89556996f93d4b54b50782 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 3 Feb 2010 15:16:57 -0800 Subject: Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin" (Fixed line endings for commit hook) Reviewed by Rick. --- indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 26690f64a6..e230fcc280 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -724,7 +724,7 @@ private: return false; // allocate some space and grab it - UInt8* item_data = new UInt8[ size + 1 ]; + UInt8* item_data = new UInt8[ size + 1 ]; memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) ); result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL ); if ( noErr != result ) -- cgit v1.2.3 From 3119c0bdcef3bdb503d2fae736528fabd7e9e0f9 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Wed, 3 Feb 2010 18:39:13 -0500 Subject: EXT-4824 - NUX Close My Inventory and open Library for a new user's first login. -Reviewed by Vir --- indra/newview/llinventorypanel.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'indra') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 12a2c370d2..a6d63e58f5 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -432,7 +432,26 @@ void LLInventoryPanel::initializeViews() rebuildViewsFor(mStartFolderID); mViewsInitialized = true; + openStartFolderOrMyInventory(); + + // Special case for new user login + if (gAgent.isFirstLogin()) + { + // Auto open the user's library + LLFolderViewFolder* lib_folder = mFolders->getFolderByID(gInventory.getLibraryRootFolderID()); + if (lib_folder) + { + lib_folder->setOpen(TRUE); + } + + // Auto close the user's my inventory folder + LLFolderViewFolder* my_inv_folder = mFolders->getFolderByID(gInventory.getRootFolderID()); + if (my_inv_folder) + { + my_inv_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN); + } + } } void LLInventoryPanel::rebuildViewsFor(const LLUUID& id) -- cgit v1.2.3 From fe5dc0351c810ba3c13d7c0c81adf910451e2293 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 4 Feb 2010 00:32:53 +0000 Subject: EXT-4237: Don't show Start Up pulldown until successful login. Previously any login attempt, even a failed one, would cause the Start Up pulldown to appear. Now only a successful login will cause this to happen. Also renamed the setting FirstRunThisInstall to the more accurate HadFirstSuccessfulLogin (and inverted its logic). Reviewed by Mani. --- indra/newview/app_settings/settings.xml | 6 +++--- indra/newview/llappviewer.cpp | 2 +- indra/newview/llpanellogin.cpp | 4 ++-- indra/newview/llstartup.cpp | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 62197406b6..3b9b3a51d5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2817,16 +2817,16 @@ Value 0 - FirstRunThisInstall + HadFirstSuccessfulLogin Comment - Specifies that you have not run the viewer since you installed the latest update + Specifies whether you have successfully logged in at least once before Persist 1 Type Boolean Value - 1 + 0 FirstSelectedDisabledPopups diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2d694eefd3..2f90885df3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2611,7 +2611,7 @@ void LLAppViewer::handleViewerCrash() gDebugInfo["StartupState"] = LLStartUp::getStartupStateString(); gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) LLMemory::getCurrentRSS() >> 10; gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin(); - gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall"); + gDebugInfo["HadFirstSuccessfulLogin"] = gSavedSettings.getBOOL("HadFirstSuccessfulLogin"); if(gLogoutInProgress) { diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index af9e791223..df9002facc 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -676,7 +676,7 @@ void LLPanelLogin::refreshLocation( bool force_visible ) // Don't show on first run after install // Otherwise ShowStartLocation defaults to true. show_start = gSavedSettings.getBOOL("ShowStartLocation") - && !gSavedSettings.getBOOL("FirstRunThisInstall"); + && gSavedSettings.getBOOL("HadFirstSuccessfulLogin"); } sInstance->childSetVisible("start_location_combo", show_start); @@ -847,7 +847,7 @@ void LLPanelLogin::loadLoginPage() oStr << "&auto_login=TRUE"; } if (gSavedSettings.getBOOL("ShowStartLocation") - && !gSavedSettings.getBOOL("FirstRunThisInstall")) + && gSavedSettings.getBOOL("HadFirstSuccessfulLogin")) { oStr << "&show_start_location=TRUE"; } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 522adc05ce..5cca87bd71 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -773,8 +773,6 @@ bool idle_startup() LLPanelLogin::giveFocus(); - gSavedSettings.setBOOL("FirstRunThisInstall", FALSE); - LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } else @@ -2012,6 +2010,9 @@ bool idle_startup() LLStartUp::setStartupState( STATE_STARTED ); + // Mark that we have successfully logged in at least once + gSavedSettings.setBOOL("HadFirstSuccessfulLogin", TRUE); + // Unmute audio if desired and setup volumes. // Unmute audio if desired and setup volumes. // This is a not-uncommon crash site, so surround it with -- cgit v1.2.3 From 97d24fe89fa4677cada315805edfa27d95d4ed8f Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 4 Feb 2010 00:37:01 +0000 Subject: EXT-4898: Reverting English.lproj change until I get a review But I want to be able to check in other commits... --- indra/newview/English.lproj/language.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt index 2c4c454fdd..bc0aa577f9 100644 --- a/indra/newview/English.lproj/language.txt +++ b/indra/newview/English.lproj/language.txt @@ -1 +1 @@ -en \ No newline at end of file +en-us \ No newline at end of file -- cgit v1.2.3 From bc882419492def6b4f822643c0cf6d4d84327d55 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 4 Feb 2010 00:41:03 +0000 Subject: EXT-4898: Trying to subvert the coding policy hooks.... .lproj/language.txt MUST NOT have a newline at the end, but the coding policy hooks won't let me do this. Making a trivial change so that I can undo it again with the relevant just-do-it flag. --- indra/newview/English.lproj/language.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt index bc0aa577f9..7eda695fea 100644 --- a/indra/newview/English.lproj/language.txt +++ b/indra/newview/English.lproj/language.txt @@ -1 +1 @@ -en-us \ No newline at end of file +en-us -- cgit v1.2.3 From c788986c9ed282f5e8afc8b5352e61986cdbc209 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 4 Feb 2010 00:42:23 +0000 Subject: EXT-4898: Turn off policy hooks so I can check in this file. English.lproj/language.txt must not have a newline in it. warn-on-failure:eol-at-eof --- indra/newview/English.lproj/language.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt index 7eda695fea..bc0aa577f9 100644 --- a/indra/newview/English.lproj/language.txt +++ b/indra/newview/English.lproj/language.txt @@ -1 +1 @@ -en-us +en-us \ No newline at end of file -- cgit v1.2.3