diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
| commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
| tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/llxml | |
| parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
| parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/llxml')
| -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 afb0d87da9..7aa2ce9606 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -847,7 +847,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) |