From 4ef75f35c195a4e2657a0e01d6b92cd40e6779f5 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 13 Aug 2010 12:56:28 -0700
Subject: [PATCH] stopped hints from appearing temporarily when retriggered
---
indra/newview/llhints.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 66799535c14..14a9871a7d9 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -104,7 +104,7 @@ class LLHintPopup : public LLPanel
void onClickClose() { hide(); }
void draw();
- void hide() { mHidden = true; mFadeTimer.reset(); }
+ void hide() { if(!mHidden) {mHidden = true; mFadeTimer.reset();} }
private:
LLNotificationPtr mNotification;
@@ -169,6 +169,10 @@ void LLHintPopup::draw()
if (mHidden)
{
alpha = clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, mFadeOutTime, 1.f, 0.f);
+ if (alpha == 0.f)
+ {
+ die();
+ }
}
else
{
--
GitLab