diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
| commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
| tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/newview/llsechandler_basic.cpp | |
| parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
merge up to 3.5.2 development
Diffstat (limited to 'indra/newview/llsechandler_basic.cpp')
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 30400a4c6a..928d26646b 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1239,7 +1239,6 @@ void LLSecAPIBasicHandler::_readProtectedData() llifstream::binary); if (!protected_data_stream.fail()) { - int offset; U8 salt[STORE_SALT_SIZE]; U8 buffer[BUFFER_READ_SIZE]; U8 decrypted_buffer[BUFFER_READ_SIZE]; @@ -1250,7 +1249,6 @@ void LLSecAPIBasicHandler::_readProtectedData() // read in the salt and key protected_data_stream.read((char *)salt, STORE_SALT_SIZE); - offset = 0; if (protected_data_stream.gcount() < STORE_SALT_SIZE) { throw LLProtectedDataException("Config file too short."); |