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 e9a7132..c4a2b2b 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" |
@@ -750,15 +750,10 @@ void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn ) | |||
750 | if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 || | 750 | if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 || |
751 | LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 ) | 751 | LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 ) |
752 | { | 752 | { |
753 | // If we spawn a new LLFloaterHTML, assume we want it to | 753 | // If we spawn a new LLFloaterMediaBrowser, assume we want it to |
754 | // follow this LLWebBrowserCtrl's setting for whether or | 754 | // follow this LLWebBrowserCtrl's setting for whether or |
755 | // not to open secondlife:///app/ links. JC. | 755 | // not to open secondlife:///app/ links. JC. |
756 | const bool open_links_externally = false; | 756 | LLFloaterMediaBrowser::showInstance(eventIn.getStringValue()); |
757 | LLFloaterHtml::getInstance()->show( | ||
758 | eventIn.getStringValue(), | ||
759 | "Second Life Browser", | ||
760 | open_links_externally, | ||
761 | mOpenAppSLURLs); | ||
762 | }; | 757 | }; |
763 | }; | 758 | }; |
764 | }; | 759 | }; |