fix for enable all popups not working

also popup notification is no longer a singleton
master
Richard Linden 2010-09-17 14:56:03 -07:00
parent 418941234d
commit 159fd0316a
3 changed files with 10 additions and 8 deletions

View File

@ -458,6 +458,13 @@ public:
return mRespondedTo;
}
bool isActive() const
{
return !isRespondedTo()
&& !isCancelled()
&& !isExpired();
}
const LLSD& getResponse() { return mResponse; }
bool isIgnored() const

View File

@ -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();

View File

@ -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"