diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llxml | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 0415be8206..0b0385d92f 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -291,6 +291,12 @@ void XMLCALL StartXMLNode(void *userData, // Set the parent-child relationship with the current active node LLXMLNode* parent = (LLXMLNode *)userData; + if (NULL == parent) + { + llwarns << "parent (userData) is NULL; aborting function" << llendl; + return; + } + new_node_ptr->mParser = parent->mParser; // Set the current active node to the new node |