diff options
| author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
| commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
| tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/llimpanel.cpp | |
| parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
| parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) | |
Merge (viewer-2-0 into gooey)
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" |