From f627140cf11232bab11fdfaf66c78544cf44f3e8 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 19 Jun 2020 12:33:15 -0400
Subject: [PATCH] DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys
unique.
There are duplicate LLTrace::BlockTimerStatHandle key strings declared in
llsettingsdaycycle.cpp and llsettingswater.cpp -- the only instances of
duplicate BlockTimerStatHandle keys in the viewer code base. SL-13467 tracks
intentional crashes due to duplicate LLInstanceTracker subclass instances with
one of those keys. The simplest experiment to try to eliminate those crashes
is to ensure that every BlockTimerStatHandle in the code base is unique.
---
indra/llinventory/llsettingsdaycycle.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index 457e5b74789..a687fd840d0 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)
--
GitLab