diff options
| author | Richard Linden <none@none> | 2010-09-17 14:56:31 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-17 14:56:31 -0700 |
| commit | a98ac26bd607ad17bbea041d50b1fac9ddc24b61 (patch) | |
| tree | 6d6f2c91ad2ce8a046dff44401fc0c5da0d8c29e | |
| parent | 99a13feade938a7801aa4323fc63a53dac294a77 (diff) | |
| parent | 159fd0316adccbf51faa2f6293952d615b3f2a14 (diff) | |
merge
| -rw-r--r-- | indra/llui/llnotifications.h | 7 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index ed29e0d83e..dcb7b48f92 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -458,6 +458,13 @@ public: return mRespondedTo; } + bool isActive() const + { + return !isRespondedTo() + && !isCancelled() + && !isExpired(); + } + const LLSD& getResponse() { return mResponse; } bool isIgnored() const diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index c824374a2b..e59f2ddd07 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -920,14 +920,10 @@ void LLMediaCtrl::draw() if ( mBorder && mBorder->getVisible() ) mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus( this ) ); - if (mCurNotification) + if (mCurNotification && !mCurNotification->isActive()) { - if (mCurNotification->isCancelled() || mCurNotification->isExpired()) - { - hideNotification(); - } + hideNotification(); } - LLPanel::draw(); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d206313185..3084aa3de8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6455,8 +6455,7 @@ Mute everyone? name="PopupAttempt" icon="Popup_Caution" type="browser" - duration="10" - unique="true"> + duration="10"> A pop-up was prevented from opening. <form name="form"> <ignore name="ignore" |