diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 14:11:56 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 14:11:56 +0100 |
| commit | 919229573c1c04fda9d1bea01de42a81c91446d1 (patch) | |
| tree | 5626fedae800a3672a845d6d1c7eaa69513e0560 /indra/newview/llstartup.cpp | |
| parent | effb2877cb339131e0b0fc544bc47877a254e364 (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
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"); |