diff options
author | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
commit | 3d137bae5c5435dde305323179d8d3d6c9720bad (patch) | |
tree | 959fe5ab17e21ab6d4455da7f7173270f8d01732 /indra/newview/llimview.h | |
parent | 6fe7144104cd8b5bd9c7d215f76afdeafe13b7ee (diff) | |
parent | f8b51f40289255ce38f65830f5bb0f29def3b757 (diff) |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index b46ce33ba6..8578fa8c06 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -27,7 +27,7 @@ #ifndef LL_LLIMVIEW_H #define LL_LLIMVIEW_H -#include "lldockablefloater.h" +#include "../llui/lldockablefloater.h" #include "lleventtimer.h" #include "llinstantmessage.h" |