refreshing with master

Dante Ruiz committed 9 years ago

Commit 3189b441 parent 628b97b2 files · +2 −3Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+2−0

@@ -5744,7 +5744,9 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) · 5743 unmodified lines
5744	}	5744	}
5745		5745
5746	void Application::toggleRunningScriptsWidget() const {	5746	void Application::toggleRunningScriptsWidget() const {
		5747	static const QUrl url("hifi/dialogs/RunningScripts.qml");
5747	DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");	5748	DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
		5749
5748	//if (_runningScriptsWidget->isVisible()) {	5750	//if (_runningScriptsWidget->isVisible()) {
5749	// if (_runningScriptsWidget->hasFocus()) {	5751	// if (_runningScriptsWidget->hasFocus()) {
5750	// _runningScriptsWidget->hide();	5752	// _runningScriptsWidget->hide();