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/llimpanel.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index a344ba0..16d4042 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -33,6 +33,7 @@
 #define LL_IMPANEL_H
 
 #include "llfloater.h"
+#include "lllogchat.h"
 #include "lluuid.h"
 #include "lldarray.h"
 #include "llinstantmessage.h"
@@ -216,7 +217,7 @@ public:
 
 	S32 getNumUnreadMessages() { return mNumUnreadMessages; }
 
-	BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+	BOOL handleKeyHere(KEY key, MASK mask);
 	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
 						   BOOL drop, EDragAndDropType cargo_type,
 						   void *cargo_data, EAcceptance *accept,
@@ -256,7 +257,7 @@ public:
 
 	// Handle other participant in the session typing.
 	void processIMTyping(const LLIMInfo* im_info, BOOL typing);
-	static void chatFromLogFile(LLString line, void* userdata);
+	static void chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata);
 
 	//show error statuses to the user
 	void showSessionStartError(const std::string& error_string);
-- 
cgit v1.1