diff options
Diffstat (limited to 'indra/newview')
4 files changed, 13 insertions, 7 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 7564a5003b..9790a1c592 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -952,11 +952,10 @@ void LLVOSky::setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLU { LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky(); - LLUUID cloud_noise_tex = cloud_noise_texture.isNull() ? psky->GetDefaultCloudNoiseTextureId() : cloud_noise_texture; - LLUUID cloud_noise_tex_next = cloud_noise_texture_next.isNull() ? (cloud_noise_texture.isNull() ? psky->GetDefaultCloudNoiseTextureId() : cloud_noise_texture) : cloud_noise_texture_next; + LLUUID cloud_noise_tex_next = cloud_noise_texture_next.isNull() ? (cloud_noise_texture.isNull() ? LLUUID() : cloud_noise_texture) : cloud_noise_texture_next; - mCloudNoiseTexturep[0] = LLViewerTextureManager::getFetchedTexture(cloud_noise_tex, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - mCloudNoiseTexturep[1] = LLViewerTextureManager::getFetchedTexture(cloud_noise_tex_next, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); + mCloudNoiseTexturep[0] = cloud_noise_texture.isNull() ? nullptr : LLViewerTextureManager::getFetchedTexture(cloud_noise_texture, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); + mCloudNoiseTexturep[1] = cloud_noise_tex_next.isNull() ? nullptr : LLViewerTextureManager::getFetchedTexture(cloud_noise_tex_next, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); if (mCloudNoiseTexturep[0]) { diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 4384c01033..c9238b80b3 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -184,7 +184,7 @@ layout="topleft" name="btn_del" right="-5" - tool_tip="Delete this setting" + tool_tip="Remove selected item" top_delta="0" width="18" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 5af009e3aa..e6fdc76de1 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -162,6 +162,8 @@ height="14" increment="0.001" initial_value="0" + left_delta="5" + top_delta="20" layout="topleft" min_val="0" max_val="1" @@ -183,6 +185,8 @@ height="14" increment="0.01" initial_value="0" + left_delta="5" + top_delta="20" layout="topleft" min_val="5.0" max_val="1000.0" @@ -204,6 +208,8 @@ height="14" increment="0.1" initial_value="0" + left_delta="5" + top_delta="20" layout="topleft" min_val="0" max_val="1" @@ -230,7 +236,7 @@ max_val="20" name="scene_gamma" top_delta="20" - width="214" + width="207" can_edit_text="true"/> </layout_panel> <layout_panel @@ -261,7 +267,7 @@ max_val="2" name="density_multip" top_delta="20" - width="207" + width="219" can_edit_text="true"/> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index eead03d185..55d104f7b2 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -178,6 +178,7 @@ <text follows="left|top" height="16" + width="120" layout="topleft" top_delta="-20" left_delta="175"> |