diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
| commit | 7d87e55c547a537526ee121dc68df6513d513f05 (patch) | |
| tree | 3a62fbf7d145ca686945f89119ace8089d3d59b1 /indra/newview/llappviewer.cpp | |
| parent | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (diff) | |
| parent | 07c04df983123d5fcf1c45f3900e66e1fd8542bc (diff) | |
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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" |