diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
| commit | fbf49910f34278a39dffff7e6c8bc654839988fb (patch) | |
| tree | 627ae5b2818f671898b855d5ef8d02a9789d9432 /indra/newview/llfloatertos.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llfloatertos.cpp')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index 149a585822..c9aa9edebd 100644 --- a/indra/newview/llfloatertos.cpp +++ b/indra/newview/llfloatertos.cpp @@ -25,7 +25,6 @@ #include "llui.h" #include "llhttpclient.h" #include "llradiogroup.h" -#include "llwebbrowserctrl.h" // static LLFloaterTOS* LLFloaterTOS::sInstance = NULL; @@ -133,12 +132,11 @@ BOOL LLFloaterTOS::postBuild() LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html"); if ( web_browser ) { - // save the window id for this web browser widget - mWebBrowserWindowId = web_browser->getEmbeddedBrowserWindowId(); - // start to observe it so we see navigate complete events - if ( mWebBrowserWindowId ) - LLMozLib::getInstance()->addObserver( mWebBrowserWindowId, this ); + if ( web_browser ) + { + web_browser->addObserver( this ); + }; gResponsePtr = LLIamHere::build( this ); LLHTTPClient::get( childGetValue( "real_url" ).asString(), gResponsePtr ); @@ -198,8 +196,11 @@ LLFloaterTOS::~LLFloaterTOS() { #if LL_LIBXUL_ENABLED // stop obsaerving events - if ( mWebBrowserWindowId ) - LLMozLib::getInstance()->addObserver( mWebBrowserWindowId, this ); + LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html"); + if ( web_browser ) + { + web_browser->addObserver( this ); + }; #endif // LL_LIBXUL_ENABLED // tell the responder we're not here anymore |