From 1656e82303985b08a4baa5e097fa9adda555accd Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 18 May 2016 14:31:14 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/commands.cpp                         | 7 +++++++
 code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp
index cb8c5d9df..59c2c9fa6 100644
--- a/code/ryzom/client/src/commands.cpp
+++ b/code/ryzom/client/src/commands.cpp
@@ -5806,3 +5806,10 @@ NLMISC_COMMAND(playedTime, "Display character played time", "")
 	CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
 	return true;
 }
+
+NLMISC_COMMAND(version, "Display client version", "")
+{
+	ucstring msg = getDebugVersion();
+	CInterfaceManager::getInstance()->displaySystemInfo(msg, "AROUND");
+	return true;
+}
diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
index c98734406..5fd114d0f 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
@@ -31,6 +31,8 @@ CMainWindow::CMainWindow():QMainWindow(), m_statusLabel(NULL)
 {
 	setupUi(this);
 
+	setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint);
+
 	// downloader
 	m_downloader = new CDownloader(this);