Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/client/src/bug_report/bug_reportDlg.cpp

@@ -389,8 +389,8 @@ END_MESSAGE_MAP()
 
 BOOL CBug_reportDlg::OnInitDialog()
 {
-	setReportEmailFunction ((void*)sendEmail);
-	setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
+	// setReportEmailFunction ((void*)sendEmail);
+	// setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
 
 	CDialog::OnInitDialog();
 

code/ryzom/client/src/client.cpp

@@ -436,9 +436,9 @@ int main(int argc, char **argv)
 
 	// Set default email value for reporting error
 #ifdef TEST_CRASH_COUNTER
-	//initCrashReport ();
-	setReportEmailFunction ((void*)sendEmail);
-	setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
+	// initCrashReport ();
+	// setReportEmailFunction ((void*)sendEmail);
+	// setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
 
 	if (string(cmdline) == "/crash")
 		volatile int toto = *(int*)0;

code/ryzom/client/src/init.cpp

@@ -846,8 +846,8 @@ void prelogInit()
 		FPU_CHECKER_ONCE
 
 		// Set default email value for reporting error
-		setReportEmailFunction ((void*)sendEmail);
-		setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
+		// setReportEmailFunction ((void*)sendEmail);
+		// setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
 
 		// create the save dir.
 		if (!CFile::isExists("save")) CFile::createDirectory("save");