diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r-- | linden/indra/newview/llimpanel.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ | |||
33 | #define LL_IMPANEL_H | 33 | #define LL_IMPANEL_H |
34 | 34 | ||
35 | #include "llfloater.h" | 35 | #include "llfloater.h" |
36 | #include "lllogchat.h" | ||
36 | #include "lluuid.h" | 37 | #include "lluuid.h" |
37 | #include "lldarray.h" | 38 | #include "lldarray.h" |
38 | #include "llinstantmessage.h" | 39 | #include "llinstantmessage.h" |
@@ -216,7 +217,7 @@ public: | |||
216 | 217 | ||
217 | S32 getNumUnreadMessages() { return mNumUnreadMessages; } | 218 | S32 getNumUnreadMessages() { return mNumUnreadMessages; } |
218 | 219 | ||
219 | BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent); | 220 | BOOL handleKeyHere(KEY key, MASK mask); |
220 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, | 221 | BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, |
221 | BOOL drop, EDragAndDropType cargo_type, | 222 | BOOL drop, EDragAndDropType cargo_type, |
222 | void *cargo_data, EAcceptance *accept, | 223 | void *cargo_data, EAcceptance *accept, |
@@ -256,7 +257,7 @@ public: | |||
256 | 257 | ||
257 | // Handle other participant in the session typing. | 258 | // Handle other participant in the session typing. |
258 | void processIMTyping(const LLIMInfo* im_info, BOOL typing); | 259 | void processIMTyping(const LLIMInfo* im_info, BOOL typing); |
259 | static void chatFromLogFile(LLString line, void* userdata); | 260 | static void chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata); |
260 | 261 | ||
261 | //show error statuses to the user | 262 | //show error statuses to the user |
262 | void showSessionStartError(const std::string& error_string); | 263 | void showSessionStartError(const std::string& error_string); |