Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-03-24 15:30:58 +01:00
commit 67b7e02983
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/bug_report/bug_reportDlg.cpp
View file

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

6
code/ryzom/client/src/client.cpp
View file

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

4
code/ryzom/client/src/init.cpp
View file

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