diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
| commit | 53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (patch) | |
| tree | 4a2c9b325f6ceb75403db9d29e1efa583de434e3 /indra/newview/llimpanel.cpp | |
| parent | 34328eed67a10ccca73ec78cd70488ac35f2ee91 (diff) | |
| parent | 1355d16d2f24f9d623df70059b1f0001cf673209 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 8b6762ce38..029ddbaf2c 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -55,15 +55,12 @@ #include "llgroupactions.h" #include "llfloater.h" #include "llfloateractivespeakers.h" -#include "llfloatercall.h" #include "llavataractions.h" -#include "llimview.h" #include "llinventory.h" #include "llinventorymodel.h" #include "llfloaterinventory.h" #include "llfloaterchat.h" #include "lliconctrl.h" -#include "llimview.h" // for LLIMModel to get other avatar id in chat #include "llkeyboard.h" #include "lllineeditor.h" #include "llpanelimcontrolpanel.h" |