Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Do not display incomplete metadata

Browse source
This commit is contained in:
Kerry Ivan Kurian 2018-10-18 00:54:15 -07:00
parent 3b15548ea3
commit 89a5da80e0
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
View file

@ -69,9 +69,8 @@ Rectangle {
// object ids. // object ids.
if (date >= startDate) { if (date >= startDate) {
resourceAccessEventText += ( resourceAccessEventText += (
message.data.callerId + " " + message.data.extra + "[" + date.toISOString() + "] " +
" " + message.data.url + message.data.url.toString().replace("__NONE__,", "") + "\n"
" [" + date.toISOString() + "]\n"
); );
} }
break; break;

13
libraries/networking/src/ResourceCache.cpp
View file

@ -498,15 +498,7 @@ bool ResourceCache::attemptRequest(QSharedPointer<Resource> resource) {
resource->makeRequest(); resource->makeRequest();
return true; return true;
} }
<<<<<<< HEAD
return false; return false;
=======
++_requestsActive;
sharedItems->appendActiveRequest(resource);
resource->makeRequest();
return true;
>>>>>>> ac26e68e78... Display resource-access events in marketplace item tester
} }
void ResourceCache::requestCompleted(QWeakPointer<Resource> resource) { void ResourceCache::requestCompleted(QWeakPointer<Resource> resource) {
@ -614,13 +606,8 @@ void Resource::allReferencesCleared() {
} }
if (_cache && isCacheable()) { if (_cache && isCacheable()) {
<<<<<<< HEAD
// create and reinsert new shared pointer // create and reinsert new shared pointer
QSharedPointer<Resource> self(this, &Resource::deleter); QSharedPointer<Resource> self(this, &Resource::deleter);
=======
// create and reinsert new shared pointer
QSharedPointer<Resource> self(this, &Resource::allReferencesCleared);
>>>>>>> ac26e68e78... Display resource-access events in marketplace item tester
setSelf(self); setSelf(self);
reinsert(); reinsert();