From 0ebcdce82bffae18459ed541f05906f625ef47e2 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Tue, 12 Mar 2013 18:53:27 -0400
Subject: [PATCH] WIP: merge fixes

---
 indra/newview/lloutputmonitorctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
index a346909027d..0682af1278c 100644
--- a/indra/newview/lloutputmonitorctrl.h
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -31,7 +31,7 @@
 #include "../llui/llview.h"
 #include "llmutelist.h"
 #include "llspeakingindicatormanager.h"
-#include "../llui/lluiimage.h"
+//#include "../llui/lluiimage.h"
 
 class LLTextBox;
 class LLUICtrlFactory;
-- 
GitLab