summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-10-29 14:59:19 -0700
committerRichard Linden <none@none>2010-10-29 14:59:19 -0700
commitb8cd56fac2b696ab72b06ab9cd87705880483f2f (patch)
treed797eeef933b38aac2a77ca6c6f0689d23599581
parentfe0d21689569de9d38413f8fbcc459b8ded50cf6 (diff)
parent95c998918646777e0f12b6663c364a93d2c8df3c (diff)
merge
-rw-r--r--indra/newview/llhints.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 7f6df627e0..3f0deb98cd 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -109,7 +109,14 @@ public:
/*virtual*/ BOOL postBuild();
- void onClickClose() { hide(); LLNotifications::instance().cancel(mNotification); }
+ void onClickClose()
+ {
+ if (!mHidden)
+ {
+ hide();
+ LLNotifications::instance().cancel(mNotification);
+ }
+ }
void draw();
void hide() { if(!mHidden) {mHidden = true; mFadeTimer.reset();} }