diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-07-03 16:37:32 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-07-03 16:37:32 +0100 |
| commit | 8969b114357d189e1bf39024762698eeddddfc78 (patch) | |
| tree | 652a5a8e0a945633edaca7a78472950a1171b4e6 /indra/llinventory | |
| parent | 9717589a55c6ae0aac5b09f1146e489df2e45c5e (diff) | |
MAINT-8838 render a sun disc if the texture(s) are provided by WL settings (default is no sun disc and just haze)
Refactor sky texture optimization to retain building the cubemap used by shiny.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 2534d5f0f1..5e6d5597e4 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -683,7 +683,7 @@ LLSettingsDay::CycleTrack_t::value_type LLSettingsDay::getSettingsNearKeyframe(c F32 dist = get_wrapping_distance(startframe, (*it).first); - LL_DEBUGS("LAPRAS") << "[" << startframe << " ... " << keyframe << " -> " << (*it).first << "@" << dist << LL_ENDL; + //LL_DEBUGS("LAPRAS") << "[" << startframe << " ... " << keyframe << " -> " << (*it).first << "@" << dist << LL_ENDL; if (dist <= (fudge * 2.0f)) return (*it); diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 0b6ad66a0c..d73ae5721a 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -640,7 +640,7 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position) dfltsetting[SETTING_BLOOM_TEXTUREID] = IMG_BLOOM1; dfltsetting[SETTING_CLOUD_TEXTUREID] = GetDefaultCloudNoiseTextureId(); dfltsetting[SETTING_MOON_TEXTUREID] = GetDefaultMoonTextureId(); - dfltsetting[SETTING_SUN_TEXTUREID] = LLUUID::null; // GetDefaultSunTextureId(); + dfltsetting[SETTING_SUN_TEXTUREID] = GetDefaultSunTextureId(); dfltsetting[SETTING_TYPE] = "sky"; @@ -1092,7 +1092,8 @@ LLUUID LLSettingsSky::GetDefaultAssetId() LLUUID LLSettingsSky::GetDefaultSunTextureId() { - return DEFAULT_SUN_ID; + //return DEFAULT_SUN_ID; + return LLUUID::null; } LLUUID LLSettingsSky::GetDefaultMoonTextureId() |