diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
| commit | 5b04123aec281de30fb8b6473600f6b1e9d16909 (patch) | |
| tree | 1ffac17fe885182483ed44fa93db723554761024 /indra/newview/llnotificationofferhandler.cpp | |
| parent | e7caafba5c4eec21f02a642e37865bc04cd6536e (diff) | |
| parent | 016b002b0f2faae0d62ce2d07b8e9856a3a1814d (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index a9678b1e93..d9359d20cf 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -166,14 +166,14 @@ bool LLOfferHandler::processNotification(const LLNotificationPtr& notification) /*virtual*/ void LLOfferHandler::onChange(LLNotificationPtr p) { - LLToastNotifyPanel* panelp = LLToastNotifyPanel::getInstance(p->getID()); + auto panelp = LLToastNotifyPanel::getInstance(p->getID()); if (panelp) { // // HACK: if we're dealing with a notification embedded in IM, update it // otherwise remove its toast // - if (dynamic_cast<LLIMToastNotifyPanel*>(panelp)) + if (dynamic_cast<LLIMToastNotifyPanel*>(panelp.get())) { panelp->updateNotification(); } |