diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
| commit | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch) | |
| tree | 25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/llcommon/llsdserialize_xml.cpp | |
| parent | 77344afa8b39b4c1fcebda4de63998a67fd4debb (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
merge changes for 5.1.4-release
Diffstat (limited to 'indra/llcommon/llsdserialize_xml.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize_xml.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp index 8d72a1c329..6d0fe862b9 100644 --- a/indra/llcommon/llsdserialize_xml.cpp +++ b/indra/llcommon/llsdserialize_xml.cpp @@ -917,7 +917,7 @@ void LLSDXMLParser::parsePart(const char *buf, int len) } // virtual -S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const +S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data, S32 max_depth) const { #ifdef XML_PARSER_PERFORMANCE_TESTS XML_Timer timer( &parseTime ); |