summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.h
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-09-17 17:03:10 +0300
committermaxim_productengine <mnikolenko@productengine.com>2018-09-17 17:03:10 +0300
commit8f44ac231921cd7b83c0b0e47fbef0b6a52a0b57 (patch)
tree2573f3a01d18acd4dab048cd5b69a1e9be278705 /indra/newview/llfloatereditextdaycycle.h
parent636839a47c6881b10d676d19c65d6c34a956622a (diff)
SL-9664 FIXED [EEP] File pickers are not threaded
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.h')
-rw-r--r--indra/newview/llfloatereditextdaycycle.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index f03a69c200..185b27bff3 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -136,6 +136,7 @@ private:
void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status);
void doImportFromDisk();
+ void loadSettingFromFile(const std::vector<std::string>& filenames);
void doApplyCreateNewInventory(const LLSettingsDay::ptr_t &day);
void doApplyUpdateInventory(const LLSettingsDay::ptr_t &day);
void doApplyEnvironment(const std::string &where, const LLSettingsDay::ptr_t &day);