diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:55 -0400 |
| commit | cb47ae3264f3d9d22add17f2cbc5699c8620705f (patch) | |
| tree | c426adad23154cb74711a78174c412ab2a2b8034 /indra/linux_updater | |
| parent | 2cddf137e3c785dc9efbe7e12b90d239d8eaa958 (diff) | |
| parent | 8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (diff) | |
merge changes for storm-971
Diffstat (limited to 'indra/linux_updater')
| -rw-r--r-- | indra/linux_updater/linux_updater.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp index d909516bf8..a81de0223c 100644 --- a/indra/linux_updater/linux_updater.cpp +++ b/indra/linux_updater/linux_updater.cpp @@ -88,9 +88,16 @@ bool translate_init(std::string comma_delim_path_list, std::vector<std::string> paths; LLStringUtil::getTokens(comma_delim_path_list, paths, ","); // split over ',' + for(std::vector<std::string>::iterator it = paths.begin(), end_it = paths.end(); + it != end_it; + ++it) + { + (*it) = gDirUtilp->findSkinnedFilename(*it, base_xml_name); + } + // suck the translation xml files into memory LLXMLNodePtr root; - bool success = LLXMLNode::getLayeredXMLNode(base_xml_name, root, paths); + bool success = LLXMLNode::getLayeredXMLNode(root, paths); if (!success) { // couldn't load string table XML |