diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-05 18:23:14 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-05 18:23:14 +0300 |
| commit | 85fd2dc8709405dda908b4b714f6461744c1ca22 (patch) | |
| tree | 8a71439dbf34bbebae00cd5284c74b0c09ec06b7 /indra | |
| parent | c2320fa0d0c9d006098d0b3830b3f40ae560768d (diff) | |
MAINT-6550 Graphic preset name including "\" causes preset to be unusable & preset cannot be deleted.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 9957039f72..836f63bffa 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -104,8 +104,7 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_nam if (found) { std::string path = gDirUtilp->add(dir, file); - std::string name = gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true); - + std::string name = LLURI::unescape(gDirUtilp->getBaseFileName(path, /*strip_exten = */ true)); LL_DEBUGS() << " Found preset '" << name << "'" << LL_ENDL; if (PRESETS_DEFAULT != name) |