summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-01-30 14:36:46 -0800
committerRider Linden <rider@lindenlab.com>2019-01-30 14:36:46 -0800
commitc7e02b0835cbb50777c677f618c4a957e69fabee (patch)
tree54148a3075642a666dec0b606c43eedf8c4c75b3 /indra/newview/llfloatereditextdaycycle.cpp
parent9246be072101e4e09f6ab2655eb78939242bac3f (diff)
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index d6c104547d..6283008a63 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1704,15 +1704,15 @@ void LLFloaterEditExtDayCycle::doImportFromDisk()
void LLFloaterEditExtDayCycle::loadSettingFromFile(const std::vector<std::string>& filenames)
{
+ LLSD messages;
if (filenames.size() < 1) return;
std::string filename = filenames[0];
LL_WARNS("LAPRAS") << "Selected file: " << filename << LL_ENDL;
- LLSettingsDay::ptr_t legacyday = LLEnvironment::createDayCycleFromLegacyPreset(filename);
+ LLSettingsDay::ptr_t legacyday = LLEnvironment::createDayCycleFromLegacyPreset(filename, messages);
if (!legacyday)
{
- LLSD args(LLSDMap("FILE", filename));
- LLNotificationsUtil::add("WLImportFail", args);
+ LLNotificationsUtil::add("WLImportFail", messages);
return;
}