From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 22:10:30 -0700 Subject: fixed merge --- indra/newview/llimhandler.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llimhandler.cpp') diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp index bc76092a20..e8c905a266 100644 --- a/indra/newview/llimhandler.cpp +++ b/indra/newview/llimhandler.cpp @@ -28,6 +28,7 @@ #include "llviewerprecompiledheaders.h" // must be first include #include "llnotificationhandler.h" +#include "llchannelmanager.h" #include "llagentdata.h" #include "llnotifications.h" -- cgit v1.2.3