diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-05 11:16:13 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-05 11:16:13 -0700 |
| commit | d4668787addf870fca0dc1cbf03c756584838261 (patch) | |
| tree | 9bd3b421026695821cb4c627d55fc7507d424d3d /indra/newview/llfloatermediabrowser.h | |
| parent | d042dd9598a91e7bdfa39ce580f935bb744f8970 (diff) | |
Allow targeted links in the embedded browser to open multiple media browser windows.
Added an optional "target" parameter" to LLWeb::loadURL and loadInternal.
Made LLViewerMediaImpl::handleMediaEvent pass the target attribute of clicked links through.
Set floater_media_browser.xml to allow multiple instances.
Added LLFloaterMediaBrowser::create() and made LLFloaterMediaBrowser assume the incoming tag is the window's target, not the URL.
Reviewed by Richard at http://codereview.lindenlab.com/2641050
Diffstat (limited to 'indra/newview/llfloatermediabrowser.h')
| -rw-r--r-- | indra/newview/llfloatermediabrowser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermediabrowser.h b/indra/newview/llfloatermediabrowser.h index c315f9e797..1645ed4613 100644 --- a/indra/newview/llfloatermediabrowser.h +++ b/indra/newview/llfloatermediabrowser.h @@ -47,10 +47,11 @@ class LLFloaterMediaBrowser : public: LLFloaterMediaBrowser(const LLSD& key); + static void create(const std::string &url, const std::string& target); + /*virtual*/ BOOL postBuild(); /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void draw(); - /*virtual*/ void onOpen(const LLSD& key); // inherited from LLViewerMediaObserver /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); |