diff options
author | Rider Linden <rider@lindenlab.com> | 2018-08-09 16:36:44 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-08-09 16:36:44 -0700 |
commit | 7a001186b3063c36a78b2537b81c75124e307ff7 (patch) | |
tree | 823593baf8f7093bedd5bd1160bbdb3469c82e9c /indra/llinventory/llsettingssky.cpp | |
parent | 3dfd3be98e19c239949eb7d59ef3fb84274322d1 (diff) |
Adjust layout of sunmoon panel and size of ext day edit. Blank sun texture. Fix edit and transition in edit day cycle. Fix default and blank images in sky textures.
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
-rw-r--r-- | indra/llinventory/llsettingssky.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 4451bd753b..072dff4ce4 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -1095,10 +1095,15 @@ LLUUID LLSettingsSky::GetDefaultAssetId() LLUUID LLSettingsSky::GetDefaultSunTextureId() { - //return DEFAULT_SUN_ID; return LLUUID::null; } + +LLUUID LLSettingsSky::GetBlankSunTextureId() +{ + return DEFAULT_SUN_ID; +} + LLUUID LLSettingsSky::GetDefaultMoonTextureId() { return DEFAULT_MOON_ID; |