summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-11-01 14:31:02 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-11-01 14:31:02 -0700
commita549d81849aca9e2dbdc375f696b3a3416b68a64 (patch)
tree54f338a26347e1d78b308e14eb83a71135e72d61
parentea2406b6a50a6f14c253b26a17777ef92115eca8 (diff)
parentb8cd56fac2b696ab72b06ab9cd87705880483f2f (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();} }