fix for mac build and possible crash when responding to notification twice
parent
9479c87274
commit
325f16d0b4
|
|
@ -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())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 ),
|
||||
|
|
|
|||
Loading…
Reference in New Issue