summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-12-07 20:36:51 +0000
committerLynx Linden <lynx@lindenlab.com>2009-12-07 20:36:51 +0000
commit374aa101ab0296d9bed3e7c592e4820930042f6e (patch)
treefc42ce05b185a8c046d3a8f63a090818a3fe897d /indra/newview/llviewerassetstorage.cpp
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent24cba353a45f6c261169fcda03cb9ac860ef8d9f (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewerassetstorage.cpp')
-rw-r--r--indra/newview/llviewerassetstorage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index c32e67ef90..a041f3ac98 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -36,7 +36,6 @@
#include "llagent.h"
#include "llviewerassetstorage.h"
-#include "llviewerbuild.h"
#include "llvfile.h"
#include "llvfs.h"