diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 | 
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 | 
| commit | 9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch) | |
| tree | 7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/llxml/llxmlnode.h | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 573ab07a40acc78e28ae390331d862d3f858bb07 (diff) | |
Pull merge from 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);  | 
