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/llviewermenu.h | |
parent | b6f3c4d07e96f3529f048a93863aa9b0f28cbad4 (diff) | |
parent | be6f3286f4a969a4de73d8f3af7b8262fe70bfb9 (diff) |
merging in latest changes
Diffstat (limited to 'indra/newview/llviewermenu.h')
-rw-r--r-- | indra/newview/llviewermenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 139f898b76..c0376ba114 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -27,7 +27,7 @@ #ifndef LL_LLVIEWERMENU_H #define LL_LLVIEWERMENU_H -#include "llmenugl.h" +#include "../llui/llmenugl.h" #include "llsafehandle.h" class LLMessageSystem; |