diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
| commit | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch) | |
| tree | ff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/newview/llappviewer.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff) | |
Merge.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9de2941c4a..a1fe898005 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -82,7 +82,7 @@ #include "lltextutil.h" #include "lllogininstance.h" #include "llprogressview.h" - +#include "llvocache.h" #include "llweb.h" #include "llsecondlifeurls.h" #include "llupdaterservice.h" @@ -132,7 +132,6 @@ #include "lltoolmgr.h" #include "llassetstorage.h" #include "llpolymesh.h" -#include "llcachename.h" #include "llaudioengine.h" #include "llstreamingaudio.h" #include "llviewermenu.h" |