diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 12 | 
1 files changed, 10 insertions, 2 deletions
| diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 8d64c8c04f..30400a4c6a 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1360,7 +1360,11 @@ void LLSecAPIBasicHandler::_writeProtectedData()  		// (even though this file isn't really secure.  Perhaps in the future  		// it may be, however.  		LLFile::remove(tmp_filename); -		throw LLProtectedDataException("Error writing Protected Data Store"); + +		// EXP-1825 crash in LLSecAPIBasicHandler::_writeProtectedData() +		// Decided throwing an exception here was overkill until we figure out why this happens +		//throw LLProtectedDataException("Error writing Protected Data Store"); +		llinfos << "LLProtectedDataException(Error writing Protected Data Store)" << llendl;  	}  	// move the temporary file to the specified file location. @@ -1369,7 +1373,11 @@ void LLSecAPIBasicHandler::_writeProtectedData()  	   (LLFile::rename(tmp_filename, mProtectedDataFilename)))  	{  		LLFile::remove(tmp_filename); -		throw LLProtectedDataException("Could not overwrite protected data store"); + +		// EXP-1825 crash in LLSecAPIBasicHandler::_writeProtectedData() +		// Decided throwing an exception here was overkill until we figure out why this happens +		//throw LLProtectedDataException("Could not overwrite protected data store"); +		llinfos << "LLProtectedDataException(Could not overwrite protected data store)" << llendl;  	}  } | 
