summaryrefslogtreecommitdiff
path: root/indra/linux_updater
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2011-03-10 12:18:27 -0800
committerEli Linden <eli@lindenlab.com>2011-03-10 12:18:27 -0800
commit70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch)
treedee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/linux_updater
parent64e672d9d92d1b8f92e968b0164b2212a71120da (diff)
parent378585e7f089b62b7a0dd69adde48cd63fc7bacc (diff)
Merge
Diffstat (limited to 'indra/linux_updater')
-rw-r--r--indra/linux_updater/linux_updater.cpp9
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