summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-10-19 14:55:46 -0700
committerRider Linden <rider@lindenlab.com>2017-10-19 14:55:46 -0700
commitea90ebff22e87c86c9de0cc6702d29783309ebf9 (patch)
tree91180fafe8fc20eb9a71a007000bcc948540a874 /indra/newview
parentde622ea576e106382d59e38cb966fe1a29f80ec0 (diff)
Figure out later why this block timer suddenly starts crashing.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llsettingswater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsettingswater.cpp b/indra/newview/llsettingswater.cpp
index d6b1234336..babaa0b218 100644
--- a/indra/newview/llsettingswater.cpp
+++ b/indra/newview/llsettingswater.cpp
@@ -45,7 +45,7 @@
//=========================================================================
namespace
{
-// LLTrace::BlockTimerStatHandle FTM_BLEND_WATERVALUES("Blending Water Environment");
+ LLTrace::BlockTimerStatHandle FTM_BLEND_WATERVALUES("Blending Water Environment");
LLTrace::BlockTimerStatHandle FTM_UPDATE_WATERVALUES("Update Water Environment");
}
@@ -228,7 +228,7 @@ void LLSettingsWater::applySpecial(void *ptarget)
//=========================================================================
void LLSettingsWater::updateSettings()
{
- LL_RECORD_BLOCK_TIME(FTM_UPDATE_WATERVALUES);
+// LL_RECORD_BLOCK_TIME(FTM_UPDATE_WATERVALUES);
LL_INFOS("WINDLIGHT", "WATER", "EEP") << "Water Parameters are dirty. Reticulating Splines..." << LL_ENDL;
// base class clears dirty flag so as to not trigger recursive update