Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged

Wayne Chen committed 8 years ago

Commit 813defe2 parents 33db8e1 7e138eb8 files · +125 −88Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

@@ -398,6 +398,10 @@ void WindowScriptingInterface::showAssetServer(const QString& upload) { · 397 unmodified lines
398	398	QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
399	399	}
400	400
	401	+void WindowScriptingInterface::setMinimumGPUTextureMemSizeStabilityCount(int stabilityCount) {
	402	+ QMetaObject::invokeMethod(qApp, " setMinimumGPUTextureMemStabilityCount", Qt::QueuedConnection, Q_ARG(int, stabilityCount));
	403	+}
	404	+
401	405	QString WindowScriptingInterface::checkVersion() {
402	406	return QCoreApplication::applicationVersion();
403	407	}