From ff46a6f42301218dcc14945feed65109a9bb71b4 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Thu, 18 Aug 2011 13:59:38 -0700
Subject: [PATCH] EXP-1107 FIX Crash in
LLFastTimer::NamedTimer::accumulateTimings
---
indra/llcommon/llsdserialize.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 6610daa1e0f..bf626005143 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -313,10 +313,8 @@ LLSDParser::LLSDParser()
LLSDParser::~LLSDParser()
{ }
-LLFastTimer::DeclareTimer FTM_SD_PARSE("LLSD Parsing");
S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes)
{
- LLFastTimer _(FTM_SD_PARSE);
mCheckLimits = (LLSDSerialize::SIZE_UNLIMITED == max_bytes) ? false : true;
mMaxBytesLeft = max_bytes;
return doParse(istr, data);
--
GitLab