Avatar upload/download fixes. Verbose logging (temporary).

src/net/common/clientthread.cpp

@@ -649,7 +649,6 @@ ClientThread::CheckAvatarDownloads()
 {
 	if (m_avatarDownloader && m_avatarDownloader->HasDownloadResult())
 	{
-		LOG_MSG("Avatar Download done.");
 		unsigned playerId;
 		boost::shared_ptr<AvatarData> tmpAvatar(new AvatarData);
 		m_avatarDownloader->GetDownloadResult(playerId, tmpAvatar->fileData);

src/net/common/downloaderthread.cpp

@@ -118,7 +118,7 @@ DownloaderThread::Main()
 				if (m_curDownloadData && !m_curDownloadData->filename.empty())
 				{
 					path filepath(m_curDownloadData->filename);
-					m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string().c_str());
+					m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
 					m_downloadInProgress = true;
 				}
 			}

src/net/common/uploaderthread.cpp

@@ -73,7 +73,10 @@ UploaderThread::Main()
 				if (!data.filename.empty() && data.filesize > 0)
 				{
 					path filepath(data.filename);
-					m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string().c_str(), data.user, data.pwd);
+					LOG_MSG("Target URL: " + data.address + filepath.leaf());
+					LOG_MSG("Filename: " + filepath.file_string());
+					LOG_MSG("Filesize: " << data.filesize);
+					m_uploadHelper->Init(data.address + filepath.leaf(), filepath.file_string(), data.user, data.pwd, data.filesize);
 					m_uploadInProgress = true;
 				}
 			}

src/net/common/uploadhelper.cpp

@@ -48,8 +48,7 @@ UploadHelper::~UploadHelper()
 void
 UploadHelper::InternalInit(const string &/*url*/, const string &targetFileName, const string &user, const string &password, int filesize)
 {
-	// Open target file for writing.
-	// Open target file for writing.
+	// Open target file for reading.
 	GetData()->targetFile = fopen(targetFileName.c_str(), "rb");
 	if (!GetData()->targetFile)
 		throw NetException(__FILE__, __LINE__, ERR_SOCK_TRANSFER_OPEN_FAILED, 0);