Merge remote-tracking branch 'ryzomcore/develop' into develop

code/nel/include/nel/misc/base64.h

@@ -16,7 +16,7 @@
 
 
 #ifndef NL_BASE64_H
-#define NL_BASE64_h
+#define NL_BASE64_H
 
 namespace NLMISC
 {

code/nel/src/gui/group_html.cpp

@@ -5178,7 +5178,7 @@ namespace NLGUI
 		if (low < min)
 			low = min;
 		if (high > max)
-			max = max;
+			high = max;
 	}
 
 	float CGroupHTML::HTMLMeterElement::getValueRatio() const

code/ryzom/client/src/interface_v3/music_player.cpp

@@ -378,7 +378,10 @@ public:
 	virtual void execute(CCtrlBase * /* pCaller */, const string &Params)
 	{
 		if(!SoundMngr)
+		{
+			CInterfaceManager::getInstance()->messageBox (CI18N::get ("uiSoundDisabled"));
 			return;
+		}
 
 		if (Params == "play_songs")
 		{
@@ -386,19 +389,26 @@ public:
 			SoundMngr->getMixer()->getMusicExtensions(extensions);
 
 			// no format supported
-			if (extensions.empty()) return;
-
-			std::string message;
-			for(uint i = 0; i < extensions.size(); ++i)
+			if (extensions.empty())
 			{
-				message += " " + extensions[i];
+				// in the very unlikely scenario
+				const ucstring message("Sound driver has no support for music.");
+				CInterfaceManager::getInstance()->displaySystemInfo(message, "SYS");
+				nlinfo("%s", message.toUtf8().c_str());
+				return;
 			}
-			message += " m3u m3u8";
-			nlinfo("Media player supports: '%s'", message.substr(1).c_str());
+			std::string newPath = CPath::makePathAbsolute(CPath::standardizePath(ClientCfg.MediaPlayerDirectory), CPath::getCurrentPath(), true);
+			std::string extlist;
+			join(extensions, ", ", extlist);
+			extlist += ", m3u, m3u8";
+
+			std::string msg(CI18N::get("uiMk_system6").toUtf8());
+			msg += ": " + newPath + " (" + extlist + ")";
+			CInterfaceManager::getInstance()->displaySystemInfo(ucstring::makeFromUtf8(msg), "SYS");
+			nlinfo("%s", msg.c_str());
 
 			// Recursive scan for files from media directory
 			vector<string> filesToProcess;
-			string newPath = CPath::standardizePath(ClientCfg.MediaPlayerDirectory);
 			CPath::getPathContent (newPath, true, false, true, filesToProcess);
 
 			uint i;

code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp

@@ -28,7 +28,7 @@
 #include "filesextractor.h"
 #include "filescleaner.h"
 
-#include "seven_zip.h"
+#include "nel/misc/seven_zip.h"
 
 #if defined(Q_OS_WIN32) && defined(QT_WINEXTRAS_LIB)
 #include <QtWinExtras/QWinTaskbarProgress>