diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
| commit | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (patch) | |
| tree | 2183c8ef1364d5f4e784cb91ea4d67b1861b2452 /indra/llxml/llxmlnode.h | |
| parent | 15b0509c01dbeec6854f4a0a5965e900eda06de1 (diff) | |
| parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llxml/llxmlnode.h')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 9df37ccb6f..e3da7169e7 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -149,8 +149,7 @@ public: LLXMLNodePtr& update_node); static LLXMLNodePtr replaceNode(LLXMLNodePtr node, LLXMLNodePtr replacement_node); - static bool getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root, - const std::vector<std::string>& paths); + static bool getLayeredXMLNode(LLXMLNodePtr& root, const std::vector<std::string>& paths); // Write standard XML file header: |