History

Merged with upstream master

Sam Gateau committed 12 years ago

Commit eae604d2 parents cecf79e a6f358713 files · +545 −295Browse files

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

Unified · Split

interface/src/Application.cpp+3−1
@@ -107,6 +107,8 @@ static unsigned STARFIELD_SEED = 1; · 106 unmodified lines
107 107
108static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored108static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
109 109
110const unsigned MAXIMUM_CACHE_SIZE = 10737418240; // 10GB
111
110static QTimer* idleTimer = NULL;112static QTimer* idleTimer = NULL;
111 113
112const QString CHECK_VERSION_URL = "https://highfidelity.io/latestVersion.xml";114const QString CHECK_VERSION_URL = "https://highfidelity.io/latestVersion.xml";
@@ -343,9 +345,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 230 unmodified lines
343 billboardPacketTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);345 billboardPacketTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
344 346
345 QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);347 QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
346
347 QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();348 QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
348 QNetworkDiskCache* cache = new QNetworkDiskCache();349 QNetworkDiskCache* cache = new QNetworkDiskCache();
350 cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE);
349 cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");351 cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
350 networkAccessManager.setCache(cache);352 networkAccessManager.setCache(cache);
351 353

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