diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
| commit | e777f9cbe6a10c7897fb6ba46fa300feae7831e7 (patch) | |
| tree | 88b304403137989d3da13cac35b69277115619fe /indra/newview/llappviewer.cpp | |
| parent | c4992e30654775c54e3dc4fb583375ec079b23a4 (diff) | |
| parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) | |
Merge with remote repo
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e184d99ffc..06c9171d67 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -49,7 +49,6 @@ #include "llviewerstats.h" #include "llmd5.h" #include "llpumpio.h" -#include "llimpanel.h" #include "llmimetypes.h" #include "llslurl.h" #include "llstartup.h" @@ -76,6 +75,7 @@ #include "llteleporthistory.h" #include "lllocationhistory.h" #include "llfasttimerview.h" +#include "llvoicechannel.h" #include "llweb.h" #include "llsecondlifeurls.h" |