diff options
| author | prep <prep@lindenlab.com> | 2013-03-12 18:53:27 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-12 18:53:27 -0400 |
| commit | 0ebcdce82bffae18459ed541f05906f625ef47e2 (patch) | |
| tree | c142cc432afa991a5fce0c6d17625aa1ad53cdec | |
| parent | 34fe6ad59161e0dcd57dfdc1feb6cfd1fcaa4794 (diff) | |
WIP: merge fixes
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index a346909027..0682af1278 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; |