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/llnotificationhandlerutil.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llnotificationhandlerutil.cpp') diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index 4231a73af1..7c82ca0da9 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -34,6 +34,7 @@ #include "llfloaterreg.h" #include "llnearbychat.h" #include "llimfloater.h" +#include "llscreenchannel.h" using namespace LLNotificationsUI; -- cgit v1.2.3