From 3e80c9b4201244ba5e87e4e068b2ddbb0af74a8c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 5 May 2010 19:08:43 +0100 Subject: VWR-19377 FIXED Inventory Search Problem --- indra/llui/llfiltereditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llui/llfiltereditor.cpp b/indra/llui/llfiltereditor.cpp index 390504234d..6c80275713 100644 --- a/indra/llui/llfiltereditor.cpp +++ b/indra/llui/llfiltereditor.cpp @@ -39,6 +39,7 @@ LLFilterEditor::LLFilterEditor(const LLFilterEditor::Params& p) : LLSearchEditor(p) { + setCommitOnFocusLost(FALSE); // we'll commit on every keystroke, don't re-commit when we take focus away (i.e. we go to interact with the actual results!) } -- cgit v1.2.3 From 2ab6b5fd657ae0d2c59580906c35c188a697cd1f Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 5 May 2010 12:14:27 -0600 Subject: for EXT-7080: Outfit texture updates are not transmitted (in either direction) when HTTP Textures is enabled. turn on HTTP uploading cap check for baked textures and turn off HTTP downloading checking for baked textures. --- indra/newview/llvoavatar.cpp | 1 + indra/newview/pipeline.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4ed2147d3b..134af871ce 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4094,6 +4094,7 @@ void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel mMaxPixelArea = llmax(pixel_area, mMaxPixelArea); mMinPixelArea = llmin(pixel_area, mMinPixelArea); imagep->resetTextureStats(); + imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures. imagep->addTextureStats(pixel_area / texel_area_ratio); imagep->setBoostLevel(boost_level); } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bdcd648689..2d2fc38573 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -265,7 +265,7 @@ BOOL LLPipeline::sRenderParticleBeacons = FALSE; BOOL LLPipeline::sRenderSoundBeacons = FALSE; BOOL LLPipeline::sRenderBeacons = FALSE; BOOL LLPipeline::sRenderHighlight = TRUE; -BOOL LLPipeline::sForceOldBakedUpload = TRUE; +BOOL LLPipeline::sForceOldBakedUpload = FALSE; S32 LLPipeline::sUseOcclusion = 0; BOOL LLPipeline::sDelayVBUpdate = TRUE; BOOL LLPipeline::sFastAlpha = TRUE; -- cgit v1.2.3 From 2673bd28d7bd7ee9f10317e1f90d0608ad0dfc6f Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Wed, 5 May 2010 13:40:55 -0500 Subject: EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by Moss (changes name of setting WindowFullScreen to FullScreen per discussion in jira.) --- indra/newview/app_settings/settings.xml | 22 +++++++++++----------- indra/newview/llappviewer.cpp | 2 +- indra/newview/llfloaterpreference.cpp | 2 +- indra/newview/lltoolgrab.cpp | 2 +- indra/newview/llviewerwindow.cpp | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d689822e4e..65cd91e770 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3467,6 +3467,17 @@ Value 0 + FullScreen + + Comment + Run SL in fullscreen mode + Persist + 1 + Type + Boolean + Value + 0 + FullScreenAspectRatio Comment @@ -10704,17 +10715,6 @@ Value 1 - WindowFullScreen - - Comment - Run SL in fullscreen mode - Persist - 1 - Type - Boolean - Value - 0 - WindowHeight Comment diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5ea70a6e96..8db0388c64 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2400,7 +2400,7 @@ bool LLAppViewer::initWindow() LLNotificationsUI::LLNotificationManager::getInstance(); - if (gSavedSettings.getBOOL("WindowFullScreen")) + if (gSavedSettings.getBOOL("FullScreen")) { // request to go full screen... which will be delayed until login gViewerWindow->toggleFullscreen(FALSE); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index e2c5ad6d02..2ab83eab79 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1197,7 +1197,7 @@ void LLFloaterPreference::applyResolution() gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth); gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight); - gViewerWindow->requestResolutionUpdate(gSavedSettings.getBOOL("WindowFullScreen")); + gViewerWindow->requestResolutionUpdate(gSavedSettings.getBOOL("FullScreen")); send_agent_update(TRUE); diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index 04d873f91b..cae5e93545 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -891,7 +891,7 @@ void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask) // Look for cursor against the edge of the screen // Only works in fullscreen - if (gSavedSettings.getBOOL("WindowFullScreen")) + if (gSavedSettings.getBOOL("FullScreen")) { if (gAgentCamera.cameraThirdPerson() ) { diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a96a6bf1b3..7a3f88ed6f 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1915,7 +1915,7 @@ void LLViewerWindow::reshape(S32 width, S32 height) // store the mode the user wants (even if not there yet) - gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen); + gSavedSettings.setBOOL("FullScreen", mWantFullscreen); // store new settings for the mode we are in, regardless if (!mWindow->getFullscreen()) @@ -4716,7 +4716,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size, BOOL was_maximized = gSavedSettings.getBOOL("WindowMaximized"); mWantFullscreen = fullscreen; mShowFullscreenProgress = show_progress_bar; - gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen); + gSavedSettings.setBOOL("FullScreen", mWantFullscreen); //gResizeScreenTexture = TRUE; -- cgit v1.2.3 From 3d8eebdb912edf1fa75f8ebfbe3dd17c51d755a2 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Wed, 5 May 2010 15:32:37 -0700 Subject: JA and PT linguistic --- .../skins/default/xui/ja/floater_world_map.xml | 4 +- .../newview/skins/default/xui/ja/notifications.xml | 2 +- .../skins/default/xui/ja/outfit_accordion_tab.xml | 2 +- .../skins/default/xui/ja/panel_group_general.xml | 2 +- .../newview/skins/default/xui/ja/panel_people.xml | 6 +- indra/newview/skins/default/xui/ja/strings.xml | 6 +- .../skins/default/xui/pt/floater_about_land.xml | 92 +++++++++++----------- .../skins/default/xui/pt/floater_god_tools.xml | 2 +- .../skins/default/xui/pt/floater_postcard.xml | 6 +- .../skins/default/xui/pt/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/pt/menu_viewer.xml | 6 +- .../newview/skins/default/xui/pt/notifications.xml | 10 +-- indra/newview/skins/default/xui/pt/panel_login.xml | 2 +- .../skins/default/xui/pt/panel_navigation_bar.xml | 2 +- .../default/xui/pt/panel_preferences_advanced.xml | 2 +- .../default/xui/pt/panel_preferences_general.xml | 2 +- .../skins/default/xui/pt/panel_side_tray.xml | 14 ++-- .../skins/default/xui/pt/teleport_strings.xml | 2 +- 18 files changed, 81 insertions(+), 83 deletions(-) diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index 0e489be9a8..ce9e7d0777 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -23,7 +23,7 @@ 土地販売 - 所有者にて + 所有者の販売 土地オークション @@ -68,7 +68,7 @@