fix for enable all popups not working
also popup notification is no longer a singletonmaster
parent
418941234d
commit
159fd0316a
|
|
@ -458,6 +458,13 @@ public:
|
|||
return mRespondedTo;
|
||||
}
|
||||
|
||||
bool isActive() const
|
||||
{
|
||||
return !isRespondedTo()
|
||||
&& !isCancelled()
|
||||
&& !isExpired();
|
||||
}
|
||||
|
||||
const LLSD& getResponse() { return mResponse; }
|
||||
|
||||
bool isIgnored() const
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue