Merge branch 'develop'

1 files changed, 10 insertions, 1 deletions

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 4490d474..6715acbb 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -112,10 +112,16 @@ private slots:
 
 	void on_actionChangeInstLWJGLVersion_triggered();
 
-	void instanceEnded();
+	void instanceEnded(BaseInstance *instance);
 
 	void on_actionInstanceSettings_triggered();
 
+	void assetsIndexStarted();
+	void assetsFilesStarted();
+	void assetsFilesProgress(int, int, int);
+	void assetsFailed();
+	void assetsFinished();
+
 public slots:
 	void instanceActivated(QModelIndex);
 
@@ -150,6 +156,9 @@ private:
 	LoginResponse m_activeLogin;
 
 	Task *m_versionLoadTask;
+
+	QLabel *m_statusLeft;
+	QLabel *m_statusRight;
 };
 
 #endif // MAINWINDOW_H