diff options
Diffstat (limited to 'indra/newview')
4 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp index 87bee62f09..fa4a725fda 100644 --- a/indra/newview/llreflectionmapmanager.cpp +++ b/indra/newview/llreflectionmapmanager.cpp @@ -525,11 +525,8 @@ void LLReflectionMapManager::update() if ((gFrameTimeSeconds - mDefaultProbe->mLastUpdateTime) < sDefaultUpdatePeriod) { -//<<<<<<< HEAD // if (sLevel == 0 && mDefaultProbe->mComplete) -//======= if (mRenderReflectionProbeLevel == 0) -//>>>>>>> Second_Life_Release#17540023-2025.07 { // when probes are disabled don't update the default probe more often than the prescribed update period oldestProbe = nullptr; } diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7a25fb03a5..c50cd5083f 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -3001,7 +3001,7 @@ void LLViewerLODTexture::processTextureStats() // restrict texture resolution to download based on RenderMaxTextureResolution static LLCachedControl<U32> max_texture_resolution(gSavedSettings, "RenderMaxTextureResolution", 2048); // sanity clamp debug setting to avoid settings hack shenanigans - max_tex_res = (F32)llclamp((S32)max_texture_resolution, 512, MAX_IMAGE_SIZE_DEFAULT); + max_tex_res = (F32)llclamp((S32)max_texture_resolution, 128, MAX_IMAGE_SIZE_DEFAULT); mMaxVirtualSize = llmin(mMaxVirtualSize, max_tex_res * max_tex_res); } diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 9644bb9f34..ec6e7dac24 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -141,6 +141,14 @@ tool_tip="Maximum resolution for 'level of detail' textures" width="90"> <combo_box.item + label="128" + name="128" + value="128"/> + <combo_box.item + label="256" + name="256" + value="256"/> + <combo_box.item label="512" name="512" value="512"/> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml index c31706adeb..2fcdf2a546 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml @@ -1697,6 +1697,14 @@ left_delta="150" top_delta="0" width="90"> <combo_box.item +label="128x128" +name="128" +value="128"/> +<combo_box.item +label="256x256" +name="256" +value="256"/> +<combo_box.item label="512x512" name="512" value="512"/> |