diff options
| author | Richard Linden <none@none> | 2010-09-21 14:43:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-21 14:43:55 -0700 |
| commit | 10d5645939b4f0bb299864123c4d1c6295d70c86 (patch) | |
| tree | fa290a57ec2740b98b8b149227ccaf57a6c56105 | |
| parent | e07c373bd4aef00aaa30735f722ed1b681a5d060 (diff) | |
| parent | 325f16d0b4c8fc9de694121d770a4931a7b98529 (diff) | |
merge
| -rw-r--r-- | indra/llui/llnotifications.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llprogressview.cpp | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 9d14c4149c..ab9bd12b85 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -600,7 +600,7 @@ void LLNotification::respond(const LLSD& response) { mResponder->handleRespond(asLLSD(), response); } - else + else if (!mResponseFunctorName.empty()) { // look up the functor LLNotificationFunctorRegistry::ResponseFunctor functor = @@ -608,6 +608,11 @@ void LLNotification::respond(const LLSD& response) // and then call it functor(asLLSD(), response); } + else + { + // no registered responder + return; + } if (mTemporaryResponder && !isReusable()) { diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 33e46e70f7..e84c9152b1 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -77,7 +77,7 @@ LLMediaCtrl::Params::Params() LLMediaCtrl::LLMediaCtrl( const Params& p) : LLPanel( p ), - LLInstanceTracker(LLUUID::generateNewID()), + LLInstanceTracker<LLMediaCtrl, LLUUID>(LLUUID::generateNewID()), mTextureDepthBytes( 4 ), mBorder(NULL), mFrequentUpdates( true ), diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index c6bd600403..e9504cbba0 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -297,7 +297,7 @@ bool LLProgressView::onAlertModal(const LLSD& notify) { // if the progress view is visible, it will obscure the notification window // in this case, we want to auto-accept WebLaunchExternalTarget notifications - if (isInVisibleChain()) + if (isInVisibleChain() && notify["sigtype"].asString() == "add") { LLNotificationPtr notifyp = LLNotifications::instance().find(notify["id"].asUUID()); if (notifyp && notifyp->getName() == "WebLaunchExternalTarget") |