diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
commit | f684d897f532bcba87cda1f72bd19efac82f6cb6 (patch) | |
tree | 6222ff28ee7825e987a127383a081297a80d7e6c /indra/llxml/llxmlnode.h | |
parent | 4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff) | |
parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff) |
Merge with viewer-development
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); |