History

Merge branch 'master' of git://github.com/worklist/hifi into windows_build

Brad Hefta-Gaub committed 12 years ago

Commit 170dbe62 parents a39c20e 8325753106 files · +1132 −2119Browse files

Showing the changes to interface/src/renderer/TextureCache.cpp (1 of 106 files). Show all

Unified · Split

interface/src/renderer/TextureCache.cpp+1−3
@@ -333,10 +333,8 @@ void NetworkTexture::handleReplyError() { · 332 unmodified lines
333 const int BASE_DELAY_MS = 1000;333 const int BASE_DELAY_MS = 1000;
334 if (++_attempts < MAX_ATTEMPTS) {334 if (++_attempts < MAX_ATTEMPTS) {
335 QTimer::singleShot(BASE_DELAY_MS * (int)pow(2.0, _attempts), this, SLOT(makeRequest()));335 QTimer::singleShot(BASE_DELAY_MS * (int)pow(2.0, _attempts), this, SLOT(makeRequest()));
336 debug << " -- retrying...\n"; 336 debug << " -- retrying...";
337 337
338 } else {
339 debug << "\n";
340 }338 }
341}339}
342 340

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