diff options
| author | callum <none@none> | 2011-10-11 11:32:05 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-11 11:32:05 -0700 |
| commit | c1a9ca33b27f4e741eeacf781a09156009167ad3 (patch) | |
| tree | fe7dad57f407e60c6ad0e910a0231d1b420d8899 /indra/newview/llcallfloater.cpp | |
| parent | 28b97b2478aadc44b41cc99c220e94206def4347 (diff) | |
| parent | 8154c245dd2f7aaee390e0206f460b9dd5b9f693 (diff) | |
EXP-1281 Merge with PE code https://hg.lindenlab.com/paulgproductengine/exp-1281/
Changeset: 20897:084550ee5c06
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 4c6ddc8be7..cc2a189b76 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -37,9 +37,9 @@ #include "llavatarnamecache.h" #include "llavatariconctrl.h" #include "llavatarlist.h" -#include "llbottomtray.h" #include "lldraghandle.h" #include "llimfloater.h" +#include "llimview.h" #include "llfloaterreg.h" #include "llparticipantlist.h" #include "llspeakers.h" |