summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-11-09 12:56:25 -0800
committerRichard Linden <none@none>2011-11-09 12:56:25 -0800
commit136751b8fb9756006fec9721808759ebf61bcf14 (patch)
tree4d8fb893fcda3287762b869d971b8755f7991a7c /indra/llui/llsdparam.h
parentf4afd56f263816a7d767b29833cf62ae2eb51560 (diff)
EXP-1482 FIX LLInitParam::Parser spam in secondlife.log file when entering a search term in location bar launching the search window
reviewed by Merov
Diffstat (limited to 'indra/llui/llsdparam.h')
-rw-r--r--indra/llui/llsdparam.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h
index c1cfa98399..3dfc6d020e 100644
--- a/indra/llui/llsdparam.h
+++ b/indra/llui/llsdparam.h
@@ -91,6 +91,8 @@ private:
LLSD* mCurWriteSD;
};
+
+extern LLFastTimer::DeclareTimer FTM_SD_PARAM_ADAPTOR;
template<typename T>
class LLSDParamAdapter : public T
{
@@ -98,8 +100,11 @@ public:
LLSDParamAdapter() {}
LLSDParamAdapter(const LLSD& sd)
{
+ LLFastTimer _(FTM_SD_PARAM_ADAPTOR);
LLParamSDParser parser;
- parser.readSD(sd, *this);
+ // don't spam for implicit parsing of LLSD, as we want to allow arbitrary freeform data and ignore most of it
+ bool parse_silently = true;
+ parser.readSD(sd, *this, parse_silently);
}
operator LLSD() const