diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-08 21:42:50 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-08 21:51:32 +0200 |
| commit | 85250265f4b1727d6bfaf5bc68bd96d867228af9 (patch) | |
| tree | 488b42813d2867041c8869366213e90465568fed /indra | |
| parent | 150993e2c2efbf75f268aec2d22257e4b562f274 (diff) | |
SL-16105 Fix Day cycle editor not expecting an asset
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatereditenvironmentbase.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.h | 2 |
2 files changed, 1 insertions, 3 deletions
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; |