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/llpanelavatar.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 6f812e9e35..f671d63557 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -52,7 +52,6 @@ #include "llinventorymodel.h" #include "viewer.h" // for gUserServer #include "roles_constants.h" -#include "llwebbrowserctrl.h" #define kArraySize( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) ) @@ -449,7 +448,7 @@ BOOL LLPanelAvatarWeb::postBuild(void) mWebBrowser->setOpenInExternalBrowser( false ); // observe browser events - LLMozLib::getInstance()->addObserver( mWebBrowser->getEmbeddedBrowserWindowId(), this ); + mWebBrowser->addObserver( this ); #endif // LL_LIBXUL_ENABLED return TRUE; @@ -508,7 +507,10 @@ LLPanelAvatarWeb::~LLPanelAvatarWeb() { #if LL_LIBXUL_ENABLED // stop observing browser events - LLMozLib::getInstance()->remObserver( mWebBrowser->getEmbeddedBrowserWindowId(), this ); + if ( mWebBrowser ) + { + mWebBrowser->remObserver( this ); + }; #endif } |