From 0e413a4724a6b60628c7f32b1403c79ea1d8425b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 14 Oct 2020 14:35:30 -0400
Subject: [PATCH] Cleanup to reduce chance for ODR violation
---
indra/newview/llviewerwindow.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 691cd9e0c0a..af25726a949 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3165,13 +3165,13 @@ void append_xui_tooltip(LLView* viewp, LLToolTip::Params& params)
}
}
-static LLTrace::BlockTimerStatHandle ftm("Update UI");
+static LLTrace::BlockTimerStatHandle FTM_UPDATE_UI("Update UI");
// Update UI based on stored mouse position from mouse-move
// event processing.
void LLViewerWindow::updateUI()
{
- LL_RECORD_BLOCK_TIME(ftm);
+ LL_RECORD_BLOCK_TIME(FTM_UPDATE_UI);
static std::string last_handle_msg;
@@ -3553,7 +3553,6 @@ void LLViewerWindow::updateUI()
// Show a new tool tip (or update one that is already shown)
BOOL tool_tip_handled = FALSE;
- std::string tool_tip_msg;
if( handled
&& !mWindow->isCursorHidden())
{
--
GitLab