From 38558960978a0741dd9c79c4c7a108b8a1f99eff Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Mon, 19 May 2008 17:02:33 +0000 Subject: EFFECTIVE MERGES: svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated --- indra/llxml/llxmlnode.cpp | 3 +++ indra/llxml/llxmlnode.h | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'indra/llxml') diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index bf9a9a14a5..1fcacb46a5 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -55,6 +55,7 @@ BOOL LLXMLNode::sStripWhitespaceValues = FALSE; LLXMLNode::LLXMLNode() : mID(""), + mParser(NULL), mIsAttribute(FALSE), mVersionMajor(0), mVersionMinor(0), @@ -72,6 +73,7 @@ LLXMLNode::LLXMLNode() : LLXMLNode::LLXMLNode(const LLString& name, BOOL is_attribute) : mID(""), + mParser(NULL), mIsAttribute(is_attribute), mVersionMajor(0), mVersionMinor(0), @@ -89,6 +91,7 @@ LLXMLNode::LLXMLNode(const LLString& name, BOOL is_attribute) : LLXMLNode::LLXMLNode(LLStringTableEntry* name, BOOL is_attribute) : mID(""), + mParser(NULL), mIsAttribute(is_attribute), mVersionMajor(0), mVersionMinor(0), diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 19156cf556..12160680f1 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -49,6 +49,13 @@ #include "llstringtable.h" +class LLVector3; +class LLVector3d; +class LLQuaternion; +class LLUUID; +class LLColor4; +class LLColor4U; + struct CompareAttributes { -- cgit v1.2.3