diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 17:29:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 17:29:04 -0400 |
| commit | 9e4927ece5448c94bc3f46f7be019c0ffe14a686 (patch) | |
| tree | 951c276092a807dd483f3847b34ffd5b95be3678 /indra/llxml/llxmlnode.cpp | |
| parent | fdddd37db095dbbefb17b1725db5fb9527ba3fd9 (diff) | |
Make LLTransUtil::parseStrings() merge all relevant strings.xml files.
Until now, adding a xui/en/strings.xml file in any non-default skin meant you
had to clone the entire file, editing only the particular entries you wanted
to override. With this change, we load strings.xml file(s) from the default
skin before loading the specified skin -- so a non-default skin can now
provide a strings.xml file containing only the specific entries it wants to
override.
Diffstat (limited to 'indra/llxml/llxmlnode.cpp')
| -rw-r--r-- | indra/llxml/llxmlnode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 2ffb0d8503..b775249219 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -897,7 +897,8 @@ bool LLXMLNode::getLayeredXMLNode(LLXMLNodePtr& root, std::vector<std::string>::const_iterator itor; - for (itor = paths.begin(), ++itor; itor != paths.end(); ++itor) + // We've already dealt with the first item, skip that one + for (itor = paths.begin() + 1; itor != paths.end(); ++itor) { std::string layer_filename = *itor; if(layer_filename.empty() || layer_filename == filename) |