From ce28e056c20bf2723f565bbf464b87781ec248a2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:42 -0500
Subject: Second Life viewer sources 1.20.2

---
 linden/indra/newview/llpanellogin.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llpanellogin.h')

diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index a754224..1100cd6 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -74,7 +74,7 @@ public:
 				void *callback_data);
 	~LLPanelLogin();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
 	virtual void draw();
 	virtual void setFocus( BOOL b );
 
@@ -112,9 +112,10 @@ private:
 	virtual void onNavigateComplete( const EventType& eventIn );
 	static void onClickForgotPassword(void*);
 	static void onPassKey(LLLineEditor* caller, void* user_data);
+	static void onSelectServer(LLUICtrl*, void*);
 	
 private:
-	LLPointer<LLViewerImage> mLogoImage;
+	LLPointer<LLUIImage> mLogoImage;
 
 	void			(*mCallback)(S32 option, void *userdata);
 	void*			mCallbackData;
-- 
cgit v1.1