summaryrefslogtreecommitdiff
path: root/indra/llxml/llxmltree.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-03-24 19:23:34 -0700
committerRichard Linden <none@none>2014-03-24 19:23:34 -0700
commite5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch)
tree359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llxml/llxmltree.h
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
parent5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff)
merge with release
Diffstat (limited to 'indra/llxml/llxmltree.h')
-rwxr-xr-xindra/llxml/llxmltree.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h
index bdcb56f1f3..a82fee0416 100755
--- a/indra/llxml/llxmltree.h
+++ b/indra/llxml/llxmltree.h
@@ -32,7 +32,7 @@
#include <list>
#include "llstring.h"
#include "llxmlparser.h"
-#include "string_table.h"
+#include "llstringtable.h"
class LLColor4;
class LLColor4U;
@@ -227,7 +227,7 @@ protected:
LLXmlTree* mTree;
LLXmlTreeNode* mRoot;
LLXmlTreeNode* mCurrent;
- BOOL mDump; // Dump parse tree to llinfos as it is read.
+ BOOL mDump; // Dump parse tree to LL_INFOS() as it is read.
BOOL mKeepContents;
};