summaryrefslogtreecommitdiff
path: root/indra/newview/llbrowsernotification.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-08-12 08:04:30 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-08-12 08:04:30 -0400
commit17902bc735ea33db11abd21095f7e0edafb7abe7 (patch)
tree0fd0b82f3bb4278f6565cc1256e361b7265aa3d7 /indra/newview/llbrowsernotification.cpp
parent8053bceaa0ccd6128536375c21cc3e9e19429efa (diff)
parent1be08814e252654db98ce8c39dc8b4cf89c2e1dc (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-vs2017
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r--indra/newview/llbrowsernotification.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
index 19747757db..0460bff1b4 100644
--- a/indra/newview/llbrowsernotification.cpp
+++ b/indra/newview/llbrowsernotification.cpp
@@ -50,7 +50,7 @@ bool LLBrowserNotification::processNotification(const LLNotificationPtr& notific
}
else if (LLViewerMediaFocus::instance().getControlsMediaID() == media_id)
{
- LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(media_id);
+ LLViewerMediaImpl* impl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(media_id);
if (impl)
{
impl->showNotification(notification);