summaryrefslogtreecommitdiff
path: root/indra/linux_updater
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-18 18:09:28 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-18 18:09:28 -0700
commitcb1c85261e768c9653ed40bf6160e7cc7ca9ce74 (patch)
treea5cccd2fca9fefe4717168f108bcb8d18fe98cf5 /indra/linux_updater
parentc2e88db89a8ba111efd0c1b61cc8dec400a007cb (diff)
parent6c0fbdafaed93b90354b37513a3b61dee56fb8b2 (diff)
Pull in 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