SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer

renamed fast timers to have unique names, changes instance tracker to never allow duplicates

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index bfdc6571c2..1bd2bc06f4 100755
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -553,10 +553,10 @@ void LLStatBar::draw()
 void LLStatBar::setStat(const std::string& stat_name)
 {
 	using namespace LLTrace;
-	const StatType<CountAccumulator>*		count_stat;
-	const StatType<EventAccumulator>*		event_stat;
-	const StatType<SampleAccumulator>*		sample_stat;
-	const StatType<MemAccumulator>*	mem_stat;
+	const StatType<CountAccumulator>*	count_stat;
+	const StatType<EventAccumulator>*	event_stat;
+	const StatType<SampleAccumulator>*	sample_stat;
+	const StatType<MemAccumulator>*		mem_stat;
 
 	if ((count_stat = StatType<CountAccumulator>::getInstance(stat_name)))
 	{