From 85250265f4b1727d6bfaf5bc68bd96d867228af9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Dec 2021 21:42:50 +0200
Subject: SL-16105 Fix Day cycle editor not expecting an asset
---
indra/newview/llfloatereditenvironmentbase.h | 2 +-
indra/newview/llfloatereditextdaycycle.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatereditenvironmentbase.h b/indra/newview/llfloatereditenvironmentbase.h
index 7c7cf5bdcd..d900d7f003 100644
--- a/indra/newview/llfloatereditenvironmentbase.h
+++ b/indra/newview/llfloatereditenvironmentbase.h
@@ -107,7 +107,7 @@ protected:
void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status);
-private:
+protected:
LLUUID mExpectingAssetId; // for asset load confirmation
};
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index 9a30fb199f..ab5d12fa36 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -194,8 +194,6 @@ private:
std::string mLastFrameSlider;
bool mShiftCopyEnabled;
- LLUUID mExpectingAssetId;
-
LLButton* mAddFrameButton;
LLButton* mDeleteFrameButton;
LLButton* mImportButton;
--
cgit v1.2.3