diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-27 18:13:52 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-27 18:13:52 +0200 |
| commit | 68ccc70e6579547d7b42134f79267a9fd40be35f (patch) | |
| tree | d57933426a9a55a5ba24d40fc9b8707697818059 /indra/newview/llappviewer.cpp | |
| parent | 42e29558db8e708f1cc59f8564710b4b7f70b7f3 (diff) | |
| parent | 8a5d4c91f5608d40c3f627cd71a26252693279f7 (diff) | |
merge
--HG--
branch : product-engine
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 923a66ee8e..2ff414344a 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" |