diff options
| author | prep <prep@lindenlab.com> | 2013-03-13 13:40:36 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-13 13:40:36 -0400 |
| commit | 54275b941df5a717d7932762ba6eb07ba34585cb (patch) | |
| tree | c1607adfb992aeb6355aafca3619cb7a46efccc5 /indra | |
| parent | 1586107e87f20da7a3eb8b14beffaed03ffc5db5 (diff) | |
| parent | 71f2032caa090efbcd0c4ad1715848ef85ebb304 (diff) | |
merge
Diffstat (limited to 'indra')
| -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; |