diff options
| author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
| commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
| tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/llxml/llxmlnode.cpp | |
| parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
| parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) | |
Automated merge
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) |