From f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Wed, 13 Jun 2007 18:02:37 +0000 Subject: result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release --- indra/llxml/llxmlnode.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llxml/llxmlnode.h') diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index e95904dad8..24fccb72c6 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -97,6 +97,10 @@ public: U32 length, LLXMLNodePtr& node, LLXMLNode* defaults); + static bool parseStream( + std::istream& str, + LLXMLNodePtr& node, + LLXMLNode* defaults); static bool updateNode( LLXMLNodePtr& node, LLXMLNodePtr& update_node); -- cgit v1.2.3