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.

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;