History

Merge remote-tracking branch 'upstream/master' into android

Brad Davis committed 8 years ago

Commit 8bfc6102 parents 3e552e5 8cb7e05540 files · +26055 −11613Browse files

Showing the changes to libraries/networking/src/BaseAssetScriptingInterface.cpp (1 of 540 files). Show all

Unified · Split

libraries/networking/src/BaseAssetScriptingInterface.cpp+1−1
@@ -47,7 +47,7 @@ bool BaseAssetScriptingInterface::initializeCache() { · 46 unmodified lines
4747 }
4848
4949 // attempt to initialize the cache
50− QMetaObject::invokeMethod(assetClient().data(), "init");
50+ QMetaObject::invokeMethod(assetClient().data(), "initCaching");
5151
5252 Promise deferred = makePromise("BaseAssetScriptingInterface--queryCacheStatus");
5353 deferred->then([this](QVariantMap result) {