summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-12-14 11:38:35 -0800
committerbrad kittenbrink <brad@lindenlab.com>2009-12-14 11:38:35 -0800
commitbad8ba5b64cb48709404ce54e06a52aaeca83529 (patch)
tree18d74882ce6e4317f9402ee1095cfe972ee2ef64 /indra
parentcb9b874b17aa4b284a622961e1e09ef42d8cd284 (diff)
Cleanup for errors post-merge.
Diffstat (limited to 'indra')
-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 440828da68..bb49804aff 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -39,7 +39,6 @@
#include "message.h"
#include "llagent.h"
-#include "llviewerbuild.h"
LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
LLVFS *vfs, const LLHost &upstream_host)