diff options
author | callum <none@none> | 2012-01-20 10:47:11 -0800 |
---|---|---|
committer | callum <none@none> | 2012-01-20 10:47:11 -0800 |
commit | 5c8b24a0553699e83f405f1663d391bc7ed0d265 (patch) | |
tree | 2c76337e04b3e44bf19043eb0ee59dd796c691b5 /indra/newview | |
parent | ac924627e29d827992c21200708b870643ec35cf (diff) |
EXP-1825 FIX crash in LLSecAPIBasicHandler::_writeProtectedData()
Diffstat (limited to 'indra/newview')
-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; } } |