diff options
| author | Richard Linden <none@none> | 2012-07-23 19:34:10 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-23 19:34:10 -0700 |
| commit | 310ebe90a9250976700a594f4027d8423a342e64 (patch) | |
| tree | 2bd38c999e9c41b1014747e396ad0413cd47e7fe /indra/llxml/llxmlnode.h | |
| parent | 3ae21b429e67faf4ee32c9387c63a552b883a472 (diff) | |
| parent | 176b7d82be3b48344e2a54f81402352273719108 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llxml/llxmlnode.h')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index e3da7169e7..ec486d7957 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -127,8 +127,8 @@ public: BOOL isNull(); BOOL deleteChild(LLXMLNode* child); - void addChild(LLXMLNodePtr new_child, LLXMLNodePtr after_child = LLXMLNodePtr(NULL)); - void setParent(LLXMLNodePtr new_parent); // reparent if necessary + void addChild(LLXMLNodePtr& new_child); + void setParent(LLXMLNodePtr& new_parent); // reparent if necessary // Serialization static bool parseFile( @@ -147,7 +147,6 @@ public: static bool updateNode( LLXMLNodePtr& node, LLXMLNodePtr& update_node); - static LLXMLNodePtr replaceNode(LLXMLNodePtr node, LLXMLNodePtr replacement_node); static bool getLayeredXMLNode(LLXMLNodePtr& root, const std::vector<std::string>& paths); |