summaryrefslogtreecommitdiff
path: root/indra/linux_updater/linux_updater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
commit85ccab2d8178c508e585f987bb076951bf2e9ddb (patch)
tree5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/linux_updater/linux_updater.cpp
parent9f2a04f217d54344360edc554456d9804e17eeb7 (diff)
parent6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff)
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
-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