diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llwebbrowserctrl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp index 710b7e1..1d187cb 100644 --- a/linden/indra/newview/llwebbrowserctrl.cpp +++ b/linden/indra/newview/llwebbrowserctrl.cpp | |||
@@ -43,8 +43,9 @@ | |||
43 | #include "llviewborder.h" | 43 | #include "llviewborder.h" |
44 | #include "llviewercontrol.h" | 44 | #include "llviewercontrol.h" |
45 | #include "llviewerwindow.h" | 45 | #include "llviewerwindow.h" |
46 | #include "llnotify.h" | ||
46 | #include "llweb.h" | 47 | #include "llweb.h" |
47 | #include "llglimmediate.h" | 48 | #include "llrender.h" |
48 | 49 | ||
49 | // linden library includes | 50 | // linden library includes |
50 | #include "llfocusmgr.h" | 51 | #include "llfocusmgr.h" |
@@ -587,7 +588,7 @@ void LLWebBrowserCtrl::draw() | |||
587 | F32 max_v = ( F32 )mWebBrowserImage->getBrowserHeight() / ( F32 )mWebBrowserImage->getHeight(); | 588 | F32 max_v = ( F32 )mWebBrowserImage->getBrowserHeight() / ( F32 )mWebBrowserImage->getHeight(); |
588 | 589 | ||
589 | // draw the browser | 590 | // draw the browser |
590 | gGL.blendFunc( GL_ONE, GL_ZERO ); | 591 | gGL.setSceneBlendType(LLRender::BT_REPLACE); |
591 | gGL.begin( LLVertexBuffer::QUADS ); | 592 | gGL.begin( LLVertexBuffer::QUADS ); |
592 | { | 593 | { |
593 | // render using web browser reported width and height, instead of trying to invert GL scale | 594 | // render using web browser reported width and height, instead of trying to invert GL scale |
@@ -604,7 +605,7 @@ void LLWebBrowserCtrl::draw() | |||
604 | gGL.vertex2i( mWebBrowserImage->getBrowserWidth(), 0 ); | 605 | gGL.vertex2i( mWebBrowserImage->getBrowserWidth(), 0 ); |
605 | } | 606 | } |
606 | gGL.end(); | 607 | gGL.end(); |
607 | gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); | 608 | gGL.setSceneBlendType(LLRender::BT_ALPHA); |
608 | } | 609 | } |
609 | gGL.popMatrix(); | 610 | gGL.popMatrix(); |
610 | 611 | ||
@@ -762,6 +763,8 @@ void LLWebBrowserCtrl::onClickLinkNoFollow( const EventType& eventIn ) | |||
762 | && !mOpenAppSLURLs) | 763 | && !mOpenAppSLURLs) |
763 | { | 764 | { |
764 | // block handling of this secondlife:///app/ URL | 765 | // block handling of this secondlife:///app/ URL |
766 | LLNotifyBox::showXml("UnableToOpenCommandURL"); | ||
767 | |||
765 | return; | 768 | return; |
766 | } | 769 | } |
767 | 770 | ||