diff options
| author | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
| commit | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (patch) | |
| tree | b61a1aa1775b3faca1baf492a969a51d7ce8b3fe /indra/newview/llwlparamset.cpp | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
| parent | 91850b6cfacb32ed32265ebd37ce7690dd79a0b0 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rwxr-xr-x | indra/newview/llwlparamset.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index dba3970635..7da0a0ad9e 100755 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -44,11 +44,11 @@ LLWLParamSet::LLWLParamSet(void) : mCloudScrollXOffset(0.f), mCloudScrollYOffset(0.f) {} -static LLFastTimer::DeclareTimer FTM_WL_PARAM_UPDATE("WL Param Update"); +static LLTrace::TimeBlock FTM_WL_PARAM_UPDATE("WL Param Update"); void LLWLParamSet::update(LLGLSLShader * shader) const { - LLFastTimer t(FTM_WL_PARAM_UPDATE); + LL_RECORD_BLOCK_TIME(FTM_WL_PARAM_UPDATE); for(LLSD::map_const_iterator i = mParamValues.beginMap(); i != mParamValues.endMap(); |