summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-19 10:13:49 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-19 10:13:49 -0400
commitc5e338f240422cc10d0e90c514a427c9ec4a1bd3 (patch)
tree12a8c3b8a56e4c7132b6a2cf8a222a6d1fbbc2ec /indra/newview/llstartup.cpp
parent35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff)
parent695e4bc17126baa282c7f27e8ac9ef1c3323fa77 (diff)
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 27b8ff0628..7ad7799515 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -564,7 +564,7 @@ bool idle_startup()
gXferManager->setUseAckThrottling(TRUE);
gXferManager->setAckThrottleBPS(xfer_throttle_bps);
}
- gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS);
+ gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS, gStaticVFS);
F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");