diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
| commit | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (patch) | |
| tree | 42d83ed5f5d34edf99c4b302d9d6744a33e5098f /indra/linux_updater/linux_updater.cpp | |
| parent | 26f2762b89705a69e831016ea67af9500907721d (diff) | |
| parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
Merged with viewer-development.
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
| -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 |