From 7bcf3bfe5c170808ff225113b49abf60559c4c46 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 8 May 2016 19:24:04 +0200
Subject: [PATCH] Merge with develop

---
 code/nel/src/sound/sound_bank.cpp                | 2 +-
 code/ryzom/common/src/game_share/http_client.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp
index 6421e722b..59330f3f8 100644
--- a/code/nel/src/sound/sound_bank.cpp
+++ b/code/nel/src/sound/sound_bank.cpp
@@ -363,7 +363,7 @@ CSound* CSoundBank::getSound(const NLMISC::CSheetId &sheetId)
 	if (sheetId.getShortId() >= _Sounds.size())
 	{
 		std::string sheetName = sheetId.toString();
-		nlwarning("NLSOUND: Sound sheet id '%s' exceeds loaded sound sheets", sheetName.c_str());
+		nldebug("NLSOUND: Sound sheet id '%s' exceeds loaded sound sheets", sheetName.c_str());
 		return NULL;
 	}
 
diff --git a/code/ryzom/common/src/game_share/http_client.cpp b/code/ryzom/common/src/game_share/http_client.cpp
index 78fd02797..d6a5fe360 100644
--- a/code/ryzom/common/src/game_share/http_client.cpp
+++ b/code/ryzom/common/src/game_share/http_client.cpp
@@ -193,20 +193,21 @@ bool CHttpClient::receive(string &res, bool verbose)
 
 		if (_Sock.receive((uint8*)buf, size, false) == CSock::Ok)
 		{
-			if(verbose) nlinfo("Received OK %d bytes", size);
+			if (verbose) nlinfo("Received OK %d bytes", size);
 			buf[1023] = '\0';
 			res += (char*)buf;
 			//nlinfo("block received '%s'", buf);
 		}
 		else
 		{
-			if(verbose) nlinfo("Received CLOSE %d bytes", size);
+			if (verbose) nlinfo("Received CLOSE %d bytes", size);
 			buf[size] = '\0';
 			res += (char*)buf;
 			//nlwarning ("server connection closed");
 			break;
 		}
 	}
+
 	//nlinfo("all received '%s'", res.c_str());
 
 	// only keep content (delimited by two \r\n) and discard server headers