diff options
Diffstat (limited to 'indra/newview/llimagefiltersmanager.cpp')
| -rw-r--r-- | indra/newview/llimagefiltersmanager.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/indra/newview/llimagefiltersmanager.cpp b/indra/newview/llimagefiltersmanager.cpp index 3b8adc1610..d63ed4126a 100644 --- a/indra/newview/llimagefiltersmanager.cpp +++ b/indra/newview/llimagefiltersmanager.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llimagefiltersmanager.cpp * @brief Load image filters list and retrieve their path. * * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2014, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -33,7 +33,7 @@ std::string get_sys_dir() { - return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "filters", ""); + return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "filters", ""); } //--------------------------------------------------------------------------- @@ -51,39 +51,39 @@ LLImageFiltersManager::~LLImageFiltersManager() // virtual void LLImageFiltersManager::initSingleton() { - loadAllFilters(); + loadAllFilters(); } void LLImageFiltersManager::loadAllFilters() { - // Load system (coming out of the box) filters - loadFiltersFromDir(get_sys_dir()); + // Load system (coming out of the box) filters + loadFiltersFromDir(get_sys_dir()); } void LLImageFiltersManager::loadFiltersFromDir(const std::string& dir) { - mFiltersList.clear(); - - LLDirIterator dir_iter(dir, "*.xml"); - while (1) - { - std::string file_name; - if (!dir_iter.next(file_name)) - { - break; // no more files - } - - // Get the ".xml" out of the file name to get the filter name. That's the one known in strings.xml - std::string filter_name_untranslated = file_name.substr(0,file_name.length()-4); - + mFiltersList.clear(); + + LLDirIterator dir_iter(dir, "*.xml"); + while (1) + { + std::string file_name; + if (!dir_iter.next(file_name)) + { + break; // no more files + } + + // Get the ".xml" out of the file name to get the filter name. That's the one known in strings.xml + std::string filter_name_untranslated = file_name.substr(0,file_name.length()-4); + // Get the localized name for the filter - std::string filter_name_translated; + std::string filter_name_translated; bool translated = LLTrans::findString(filter_name_translated, filter_name_untranslated); - std::string filter_name = (translated ? filter_name_translated: filter_name_untranslated); - + std::string filter_name = (translated ? filter_name_translated: filter_name_untranslated); + // Store the filter in the list with its associated file name mFiltersList[filter_name] = file_name; - } + } } // Note : That method is a bit heavy handed but the list of filters is always small (10 or so) |