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/llsyswellwindow.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llsyswellwindow.cpp') diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 99342bb564..ca93027352 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -40,6 +40,7 @@ #include "llviewerwindow.h" #include "llchiclet.h" +#include "llchannelmanager.h" #include "lltoastpanel.h" #include "llnotificationmanager.h" #include "llnotificationsutil.h" -- cgit v1.2.3