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/llfloaterimcontainer.h | |
| parent | b6f3c4d07e96f3529f048a93863aa9b0f28cbad4 (diff) | |
| parent | be6f3286f4a969a4de73d8f3af7b8262fe70bfb9 (diff) | |
merging in latest changes
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" |