From 7a001186b3063c36a78b2537b81c75124e307ff7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 9 Aug 2018 16:36:44 -0700
Subject: 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.

---
 indra/llinventory/llsettingssky.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/llinventory/llsettingssky.cpp')

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;
-- 
cgit v1.2.3