From d4018e22446904f25ec1363717df86ba7e48bbdf Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 21 Oct 2010 14:37:51 -0400 Subject: Manual fix for merge compile errors. --- indra/newview/llcallfloater.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 6f8f0381f1..b2e9564f7d 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -45,6 +45,7 @@ #include "llspeakers.h" #include "lltextutil.h" #include "lltransientfloatermgr.h" +#include "llviewercontrol.h" #include "llviewerdisplayname.h" #include "llviewerwindow.h" #include "llvoicechannel.h" -- cgit v1.2.3