diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-13 17:06:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-13 17:06:33 -0500 |
| commit | fc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (patch) | |
| tree | 02b44eccea8612a11070c3410e25771543d875e6 | |
| parent | e01c08275cd058b1c8b1fbcc12b5e88fdf73d39e (diff) | |
SH-2559 Remove fast timer (could be responsible for some crashes).
| -rw-r--r-- | indra/llcommon/llsdserialize_xml.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp index bf216d41bf..be9db53906 100644 --- a/indra/llcommon/llsdserialize_xml.cpp +++ b/indra/llcommon/llsdserialize_xml.cpp @@ -354,7 +354,6 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize) return count; } -LLFastTimer::DeclareTimer FTM_SD_PARSE_READ_STREAM("LLSD Read Stream"); S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) { XML_Status status; @@ -374,7 +373,7 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) { break; } - { LLFastTimer _(FTM_SD_PARSE_READ_STREAM); + { count = get_till_eol(input, (char *)buffer, BUFFER_SIZE); if (!count) |