diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 19:02:21 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-11 19:02:21 -0400 |
| commit | 949e18d98ad272562628894f4102d3a4314ed7b0 (patch) | |
| tree | 1ecdaf0aaab82c409a51bf78719366fd9ffce4ef /indra/llxml/llxmlnode.cpp | |
| parent | fdb0e001f70f40267fa5b42e2d97b7128918b5ad (diff) | |
| parent | 9e4927ece5448c94bc3f46f7be019c0ffe14a686 (diff) | |
Merge revised viewer_manifest.py rename logic
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) |