summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-13 12:56:28 -0700
committerRichard Nelson <none@none>2010-08-13 12:56:28 -0700
commit4ef75f35c195a4e2657a0e01d6b92cd40e6779f5 (patch)
tree15a22e49f92520364eb40c34f2c60e2bc4e847e8 /indra/newview
parent187c229aca41a2a26caf05bd7d8d6c0d6a378699 (diff)
stopped hints from appearing temporarily when retriggered
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llhints.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 66799535c1..14a9871a7d 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -104,7 +104,7 @@ public:
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
{