diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-13 09:14:51 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-13 09:14:51 -0800 |
| commit | 177737fa342602530345d1450277dd1048c077bd (patch) | |
| tree | 00e095e58ba2a4c72358df934fcfd90f292eb959 /indra/newview/lloutputmonitorctrl.h | |
| parent | b6f3c4d07e96f3529f048a93863aa9b0f28cbad4 (diff) | |
| parent | be6f3286f4a969a4de73d8f3af7b8262fe70bfb9 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 7671a736d6..af2fd45823 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -28,10 +28,10 @@ #define LL_LLOUTPUTMONITORCTRL_H #include "v4color.h" -#include "llview.h" +#include "../llui/llview.h" #include "llmutelist.h" #include "llspeakingindicatormanager.h" -#include "lluiimage.h" +#include "../llui/lluiimage.h" class LLTextBox; class LLUICtrlFactory; |