summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-17 14:56:03 -0700
committerRichard Linden <none@none>2010-09-17 14:56:03 -0700
commit159fd0316adccbf51faa2f6293952d615b3f2a14 (patch)
tree71f8baf00792fdcbfec6f2603c9ce14c5a5ab46c /indra/newview
parent418941234dc276fe8ecc54abba3e06887ea78bfe (diff)
fix for enable all popups not working
also popup notification is no longer a singleton
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmediactrl.cpp8
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml3
2 files changed, 3 insertions, 8 deletions
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"