diff options
Diffstat (limited to 'linden/indra/newview/llwebbrowserctrl.cpp')
-rw-r--r-- | linden/indra/newview/llwebbrowserctrl.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp index a80ce69..7a9194c 100644 --- a/linden/indra/newview/llwebbrowserctrl.cpp +++ b/linden/indra/newview/llwebbrowserctrl.cpp | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "llwebbrowserctrl.h" | 35 | #include "llwebbrowserctrl.h" |
36 | 36 | ||
37 | // viewer includes | 37 | // viewer includes |
38 | #include "llfloaterhtml.h" | 38 | #include "llfloaterhtmlhelp.h" |
39 | #include "llfloaterworldmap.h" | 39 | #include "llfloaterworldmap.h" |
40 | #include "lluictrlfactory.h" | 40 | #include "lluictrlfactory.h" |
41 | #include "llurldispatcher.h" | 41 | #include "llurldispatcher.h" |
@@ -744,15 +744,10 @@ void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn ) | |||
744 | if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 || | 744 | if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 || |
745 | LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 ) | 745 | LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 ) |
746 | { | 746 | { |
747 | // If we spawn a new LLFloaterHTML, assume we want it to | 747 | // If we spawn a new LLFloaterMediaBrowser, assume we want it to |
748 | // follow this LLWebBrowserCtrl's setting for whether or | 748 | // follow this LLWebBrowserCtrl's setting for whether or |
749 | // not to open secondlife:///app/ links. JC. | 749 | // not to open secondlife:///app/ links. JC. |
750 | const bool open_links_externally = false; | 750 | LLFloaterMediaBrowser::showInstance(eventIn.getStringValue()); |
751 | LLFloaterHtml::getInstance()->show( | ||
752 | eventIn.getStringValue(), | ||
753 | "Second Life Browser", | ||
754 | open_links_externally, | ||
755 | mOpenAppSLURLs); | ||
756 | }; | 751 | }; |
757 | }; | 752 | }; |
758 | }; | 753 | }; |