diff options
author | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
commit | 8c7f5e902625173aada5377c5972b72a684bedf0 (patch) | |
tree | 188d9445f4e610b2a6e05b6af667ab47d38e65a2 /indra/newview/llimpanel.h | |
parent | c3b2f98012a32c0f241b814a27113e756961778c (diff) | |
parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) |
branch merge
Diffstat (limited to 'indra/newview/llimpanel.h')
-rw-r--r-- | indra/newview/llimpanel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 39107d9a22..b8f99d45c9 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -127,7 +127,6 @@ public: // Handle other participant in the session typing. void processIMTyping(const LLIMInfo* im_info, BOOL typing); - static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata); private: // Called by UI methods. |