History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 12 years ago

Commit 5f8c5d32 parents 7ce380a 7a73ecf12 files · +589 −508Browse files

Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all

Unified · Split

interface/src/Application.cpp+4−0
@@ -58,6 +58,7 @@ · 57 unmodified lines
5858 #include <PacketHeaders.h>
5959 #include <ParticlesScriptingInterface.h>
6060 #include <PerfStat.h>
61+#include <ResourceCache.h>
6162 #include <UUID.h>
6263 #include <VoxelSceneStats.h>
6364
@@ -275,6 +276,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 211 unmodified lines
275276 cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
276277 _networkAccessManager->setCache(cache);
277278
279+ ResourceCache::setNetworkAccessManager(_networkAccessManager);
280+ ResourceCache::setRequestLimit(3);
281+
278282 _window->setCentralWidget(_glWidget);
279283
280284 restoreSizeAndPosition();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t