diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llxml/llxmlnode.h | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
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
Diffstat (limited to 'indra/llxml/llxmlnode.h')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 4 |
1 files changed, 4 insertions, 0 deletions
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); |