diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-13 16:32:24 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-13 16:32:24 -0500 |
| commit | 715c911d4a22ee7533e4db3e6e570ac3acb8108d (patch) | |
| tree | 8a8c8c8777788cc23acfbde2d5e22f0bab943887 /indra | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
SH-2559 Remove fast timer (could be responsible for some crashes).
Diffstat (limited to 'indra')
| -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..97aff3c89a 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) |