summaryrefslogtreecommitdiff
path: root/indra/newview/llhints.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-11-05 16:45:18 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-11-05 16:45:18 -0700
commitd1c365e7b79c91a51b847535d8df0d804af5ae70 (patch)
tree786ada896c585004d9e94c2171f13fd808009441 /indra/newview/llhints.cpp
parent169fe36f69e3be6104af980ed005af5b77909e90 (diff)
parent124a59263184391b0b4ec418c532b7a715e9b5a3 (diff)
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
Diffstat (limited to 'indra/newview/llhints.cpp')
-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();} }