diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
| commit | df4d167cd13fd89a85e4d30dca94e40c934707d7 (patch) | |
| tree | cde9373bce657013bf04c83ab60b4a4aa826fc76 /indra/newview/llpanellogin.h | |
| parent | 8fde5f0d3241205067e5d7bf5380757e764eff31 (diff) | |
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
Diffstat (limited to 'indra/newview/llpanellogin.h')
| -rw-r--r-- | indra/newview/llpanellogin.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 191e88c25b..f2a58b7b5f 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -39,6 +39,7 @@ #include "llviewerimage.h" #include "llstring.h" #include "llmd5.h" +#include "llwebbrowserctrl.h" class LLTextBox; class LLLineEditor; @@ -64,6 +65,9 @@ extern LLLoginHandler gLoginHandler; class LLPanelLogin : public LLPanel +#if LL_LIBXUL_ENABLED + , public LLWebBrowserCtrlObserver +#endif { public: LLPanelLogin(const LLRect &rect, BOOL show_server, @@ -89,6 +93,11 @@ public: private: static void onClickQuit(void*); static void onClickVersion(void*); + +#if LL_LIBXUL_ENABLED + // browser observer impls + virtual void onNavigateComplete( const EventType& eventIn ); +#endif private: LLPointer<LLViewerImage> mLogoImage; |