aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llxml/llxmlnode.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:58 -0500
committerJacek Antonelli2008-08-15 23:44:58 -0500
commit089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch)
tree0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/llxml/llxmlnode.h
parentSecond Life viewer sources 1.16.0.5 (diff)
downloadmeta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/llxml/llxmlnode.h')
-rw-r--r--linden/indra/llxml/llxmlnode.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index e876739..f95a53b 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -94,7 +94,7 @@ public:
94 }; 94 };
95 95
96protected: 96protected:
97 virtual ~LLXMLNode(); 97 ~LLXMLNode();
98 98
99public: 99public:
100 LLXMLNode(); 100 LLXMLNode();
@@ -117,6 +117,10 @@ public:
117 U32 length, 117 U32 length,
118 LLXMLNodePtr& node, 118 LLXMLNodePtr& node,
119 LLXMLNode* defaults); 119 LLXMLNode* defaults);
120 static bool parseStream(
121 std::istream& str,
122 LLXMLNodePtr& node,
123 LLXMLNode* defaults);
120 static bool updateNode( 124 static bool updateNode(
121 LLXMLNodePtr& node, 125 LLXMLNodePtr& node,
122 LLXMLNodePtr& update_node); 126 LLXMLNodePtr& update_node);