diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
| commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
| tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/newview/llsechandler_basic.cpp | |
| parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge with viewer-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."); |