From 9e4927ece5448c94bc3f46f7be019c0ffe14a686 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 11 Oct 2012 17:29:04 -0400
Subject: 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.
---
indra/llxml/llxmlnode.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra/llxml')
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)
--
cgit v1.2.3