diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-21 17:56:11 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-21 17:56:11 -0400 |
commit | 955b727550e8595fd67c55775d8f0fe249826277 (patch) | |
tree | f4ac70eb36bcb14d44fad4199811d365eb4b788f /indra/llxml/llxmlnode.h | |
parent | 77fff26431671ffef8cf482044b1fcd98262d3e0 (diff) | |
parent | 5b9ee2a9d5687eae6fd48ee6038cd2f7ed1d9a53 (diff) |
merge
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: |