diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/lllogchat.cpp | |
parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r-- | indra/newview/lllogchat.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 33fd3e3bf1..fc9654e9ad 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -39,6 +39,8 @@ #include "lltrans.h" #include "llviewercontrol.h" +#include "llinstantmessage.h" + #include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/regex.hpp> |