diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index fcecc46f84..6a3d1ecf88 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -91,7 +91,7 @@ U32 micro_sleep(U64 us, U32 max_yields) U32 micro_sleep(U64 us, U32 max_yields) { - LL_PROFILE_ZONE_SCOPED; + // LL_PROFILE_ZONE_SCOPED; // remove pointless profiling #if 0 LARGE_INTEGER ft; ft.QuadPart = -static_cast(us * 10); // '-' using relative time @@ -109,7 +109,7 @@ U32 micro_sleep(U64 us, U32 max_yields) void ms_sleep(U32 ms) { - LL_PROFILE_ZONE_SCOPED; + // LL_PROFILE_ZONE_SCOPED; // remove pointless profiling micro_sleep(ms * 1000, 0); } diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 5880fb7e87..8e72edd2cf 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -292,7 +292,7 @@ void HttpService::threadRun(LLCoreInt::HttpThread * thread) ELoopSpeed loop(REQUEST_SLEEP); while (! mExitRequested) { - LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK; + // LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK; // remove pointless profiling try { loop = processRequestQueue(loop); diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 47818fcb59..f323048ae6 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1294,7 +1294,7 @@ void LLUrlEntryParcel::processParcelInfo(const LLParcelData& parcel_data) // LLUrlEntryPlace::LLUrlEntryPlace() { - mPattern = boost::regex("((hop://[-\\w\\.\\:\\@]+/[^/]+/?)|((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/-?\\d+|\\d+/-?\\d+)/?)$", // + mPattern = boost::regex("(((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/-?\\d+|\\d+/-?\\d+)/?)|(hop://[-\\w\\.\\:\\@]+/[^\\s/]+/?(?![^\\s]))", // boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_slurl.xml"; mTooltip = LLTrans::getString("TooltipSLURL"); diff --git a/indra/newview/app_settings/graphic_preset_controls.xml b/indra/newview/app_settings/graphic_preset_controls.xml index fff393b124..1402dda73b 100644 --- a/indra/newview/app_settings/graphic_preset_controls.xml +++ b/indra/newview/app_settings/graphic_preset_controls.xml @@ -74,13 +74,11 @@ RenderShaderLightingMaxLevel RenderShadowDetail RenderShadowResolutionScale - RenderSkyAmbientScale RenderSkyAutoAdjustAmbientScale RenderSkyAutoAdjustBlueDensityScale RenderSkyAutoAdjustBlueHorizonScale RenderSkyAutoAdjustSunColorScale RenderSkyAutoAdjustHDRScale - RenderSkyAutoAdjustLegacy RenderSkyAutoAdjustProbeAmbiance RenderSkySunlightScale RenderSSAOIrradianceScale diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi index 64a278637e..e1417c2260 100755 Binary files a/indra/newview/installers/windows/lang_ja.nsi and b/indra/newview/installers/windows/lang_ja.nsi differ diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index d4da3bfbe5..836869a665 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -538,6 +538,11 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n { gSavedSettings.setString("PresetGraphicActive", name); + // [FIRE-35390] Old viewer presets have these as true and 0.7, whereas the equivalent on modern viewers is false and 1.0 + gSavedSettings.setBOOL("RenderSkyAutoAdjustLegacy", false); + gSavedSettings.setF32("RenderSkyAmbientScale", 1.0); + // + // Update indirect controls LLAvatarComplexityControls::setIndirectControls(); diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index dd0c77b482..2f1cdeb737 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -808,6 +808,14 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id, imagep->setExplicitFormat(internal_format, primary_format); } + // [FIRE-35428] - Mega prim issue - fix compressed sculpted textures + // Sculpted textures use the RGBA data for coodinates, so any compression can cause artifacts. + if (boost_priority == LLViewerFetchedTexture::BOOST_SCULPTED) + { + // Disable the compression of BOOST_SCULPTED textures + if (imagep->getGLTexture())imagep->getGLTexture()->setAllowCompression(false); + } + // [FIRE-35428] addImage(imagep, get_element_type(boost_priority)); if (boost_priority != 0) @@ -835,7 +843,11 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id, } // Keep Fast Cache option - if(fast_cache_fetching_enabled) + // [FIRE-35428] - Mega prim issue - fix compressed sculpted textures + //if(fast_cache_fetching_enabled) + // If the texture is Sculpted, don't allow it to be added to fast cache as it can affect the texture. + if(fast_cache_fetching_enabled && boost_priority != LLViewerFetchedTexture::BOOST_SCULPTED) + // [FIRE-35428] { mFastCacheList.insert(imagep); imagep->setInFastCacheList(true); diff --git a/indra/newview/skins/ansastorm/xui/ja/floater_camera.xml b/indra/newview/skins/ansastorm/xui/ja/floater_camera.xml new file mode 100644 index 0000000000..9f078e0221 --- /dev/null +++ b/indra/newview/skins/ansastorm/xui/ja/floater_camera.xml @@ -0,0 +1,42 @@ + + + + 焦点を中心にカメラを回転します。 + + + 焦点に向けてカメラをズームします。 + + + カメラを上下左右に移動させます。 + + + オブジェクトを見る + + プリセットを使用 + + + + + + - - +