From 2a613d7363c4e91a7258d4f0ea3971db1569e788 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 1 Jun 2018 16:24:36 -0700
Subject: Rework preset loading and context menu from inventory.

---
 indra/llinventory/llsettingsdaycycle.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'indra/llinventory/llsettingsdaycycle.h')

diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 5e6fc7f21d..101cacc3a2 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -60,6 +60,8 @@ public:
     static const S32            TRACK_MAX;
     static const S32            FRAME_MAX;
 
+    static const LLUUID         DEFAULT_ASSET_ID;
+
     typedef std::map<F32, LLSettingsBase::ptr_t>    CycleTrack_t;
     typedef std::vector<CycleTrack_t>               CycleList_t;
     typedef std::shared_ptr<LLSettingsDay>          ptr_t;
@@ -105,10 +107,7 @@ public:
     virtual LLSettingsSkyPtr_t  buildSky(LLSD) const = 0;
     virtual LLSettingsWaterPtr_t buildWater(LLSD) const = 0;
 
-    virtual LLSettingsSkyPtr_t  getNamedSky(const std::string &) const = 0;
-    virtual LLSettingsWaterPtr_t getNamedWater(const std::string &) const = 0;
-
-    void    setInitialized(bool value = true) { mInitialized = value; }
+    void                        setInitialized(bool value = true) { mInitialized = value; }
     CycleTrack_t &              getCycleTrack(S32 track);
 
     virtual validation_list_t   getValidationList() const override;
-- 
cgit v1.2.3