diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-13 11:17:07 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-13 11:17:07 -0800 |
| commit | fa822a2ae50f8d070da19c64b3b3c03643d7c8b2 (patch) | |
| tree | f0a6cf99040e17c9c8ed2516e9d5cf99ab2b01bf /indra/newview/llfloaterimcontainer.h | |
| parent | 5df9d52d48b56a5d8f36a45ced0393c99473f536 (diff) | |
| parent | 177737fa342602530345d1450277dd1048c077bd (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 4f1bb96d9b..1a3e64f759 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -32,11 +32,11 @@ #include "llimview.h" #include "llevents.h" -#include "llfloater.h" -#include "llmultifloater.h" +#include "../llui/llfloater.h" +#include "../llui/llmultifloater.h" #include "llavatarpropertiesprocessor.h" #include "llgroupmgr.h" -#include "lltrans.h" +#include "../llui/lltrans.h" #include "llconversationmodel.h" #include "llconversationview.h" |