Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance

Brad Hefta-Gaub committed 11 years ago

Commit 6fac4472 parents 248107c da74d4b14 files · +70 −67Browse files

Showing the changes to libraries/script-engine/src/ScriptCache.cpp (1 of 14 files). Show all

Unified · Split

@@ -31,7 +31,6 @@ void ScriptCache::clearCache() { · 30 unmodified lines
31	31	_scriptCache.clear();
32	32	}
33	33
34		−
35	34	QString ScriptCache::getScript(const QUrl& unnormalizedURL, ScriptUser* scriptUser, bool& isPending, bool reload) {
36	35	QUrl url = ResourceManager::normalizeURL(unnormalizedURL);
37	36	QString scriptContents;