diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-05-24 21:17:41 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-05-24 21:17:41 +0300 |
| commit | 6aa393f7f50ca30b65391f4ae230a3357092f3cd (patch) | |
| tree | 3aec30df2f08a88e525823b28ee1fe983d0c349b /indra/newview/llenvironment.cpp | |
| parent | 63ecb7325e77bf3ca568788a4557045054a4520b (diff) | |
SL-11287 [EEP] Importing certain legacy windlights give upload error
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 57e6ab7159..081b3a3d42 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -2165,7 +2165,7 @@ LLEnvironment::EnvironmentInfo::ptr_t LLEnvironment::EnvironmentInfo::extractLeg //========================================================================= LLSettingsWater::ptr_t LLEnvironment::createWaterFromLegacyPreset(const std::string filename, LLSD &messages) { - std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(filename), true)); + std::string name(gDirUtilp->getBaseFileName(filename, true)); std::string path(gDirUtilp->getDirName(filename)); LLSettingsWater::ptr_t water = LLSettingsVOWater::buildFromLegacyPresetFile(name, path, messages); @@ -2180,7 +2180,7 @@ LLSettingsWater::ptr_t LLEnvironment::createWaterFromLegacyPreset(const std::str LLSettingsSky::ptr_t LLEnvironment::createSkyFromLegacyPreset(const std::string filename, LLSD &messages) { - std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(filename), true)); + std::string name(gDirUtilp->getBaseFileName(filename, true)); std::string path(gDirUtilp->getDirName(filename)); LLSettingsSky::ptr_t sky = LLSettingsVOSky::buildFromLegacyPresetFile(name, path, messages); @@ -2194,7 +2194,7 @@ LLSettingsSky::ptr_t LLEnvironment::createSkyFromLegacyPreset(const std::string LLSettingsDay::ptr_t LLEnvironment::createDayCycleFromLegacyPreset(const std::string filename, LLSD &messages) { - std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(filename), true)); + std::string name(gDirUtilp->getBaseFileName(filename, true)); std::string path(gDirUtilp->getDirName(filename)); LLSettingsDay::ptr_t day = LLSettingsVODay::buildFromLegacyPresetFile(name, path, messages); |