diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 02:37:15 +0200 |
| commit | 5f731d84cb5823bdc4cae5be288f2de2ffb9f5f9 (patch) | |
| tree | 04ddffec7d5a004150aefd5fdbf247863e2a8926 /indra/newview/llfloaterwebcontent.cpp | |
| parent | 4aa9dfec746f28696a195fe81aed9b6ef0791954 (diff) | |
| parent | e96d0d5e304324e6ab0c469773fb7110a65fc3f1 (diff) | |
Downstream merge from 494-maint-wassail
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 13953d6be5..c591dfacaf 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -234,7 +234,7 @@ void LLFloaterWebContent::preCreate(LLFloaterWebContent::Params& p) void LLFloaterWebContent::open_media(const Params& p) { - LLViewerMedia::proxyWindowOpened(p.target(), p.id()); + LLViewerMedia::getInstance()->proxyWindowOpened(p.target(), p.id()); mWebBrowser->setHomePageUrl(p.url); mWebBrowser->setTarget(p.target); mWebBrowser->navigateTo(p.url); @@ -308,7 +308,7 @@ void LLFloaterWebContent::onClose(bool app_quitting) LLTwitterConnect::instance().setConnectionState(LLTwitterConnect::TWITTER_CONNECTION_FAILED); } } - LLViewerMedia::proxyWindowClosed(mUUID); + LLViewerMedia::getInstance()->proxyWindowClosed(mUUID); destroy(); } |
