summaryrefslogtreecommitdiff
path: root/indra/linux_updater
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-03-23 01:26:03 +0000
committerDon Kjer <don@lindenlab.com>2011-03-23 01:26:03 +0000
commit1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch)
tree326e829b4233658ba8698e06ff17267618e93a62 /indra/linux_updater
parentbecc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff)
parente4a4d75104916968ce03337094b1194e0daff438 (diff)
Merge with viewer-development
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