diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-06 21:48:11 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-06 21:48:11 +0300 |
| commit | 4ac0ab2af3af8e1629b2023e566142f30dceeeb2 (patch) | |
| tree | a419ba7feff1667cbd8c532244c9b3078229dc60 /indra/llinventory/llsettingsdaycycle.cpp | |
| parent | 3c564f5afcd59bbbce135a6fc531361196bae2f6 (diff) | |
| parent | 7c122757f9ed2bd3b7ba033905db1dcb143eec6d (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
Diffstat (limited to 'indra/llinventory/llsettingsdaycycle.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 457e5b7478..a687fd840d 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -41,8 +41,8 @@ //========================================================================= namespace { - LLTrace::BlockTimerStatHandle FTM_BLEND_WATERVALUES("Blending Water Environment"); - LLTrace::BlockTimerStatHandle FTM_UPDATE_WATERVALUES("Update Water Environment"); + LLTrace::BlockTimerStatHandle FTM_BLEND_WATERVALUES("Blending Water Environment Day"); + LLTrace::BlockTimerStatHandle FTM_UPDATE_WATERVALUES("Update Water Environment Day"); template<typename T> inline T get_wrapping_distance(T begin, T end) |