diff options
author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/llmessage/message.cpp | |
parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/llmessage/message.cpp')
-rw-r--r-- | indra/llmessage/message.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index d0b0e178b8..6a425cfe98 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -3147,7 +3147,7 @@ bool LLMessageSystem::generateDigestForWindowAndUUIDs(char* digest, const S32 wi LL_ERRS("Messaging") << "Trying to generate complex digest on a machine without a shared secret!" << llendl; } - U32 now = time(NULL); + U32 now = (U32)time(NULL); now /= window; @@ -3167,7 +3167,7 @@ bool LLMessageSystem::isMatchingDigestForWindowAndUUIDs(const char* digest, cons } char our_digest[MD5HEX_STR_SIZE]; /* Flawfinder: ignore */ - U32 now = time(NULL); + U32 now = (U32)time(NULL); now /= window; @@ -3213,7 +3213,7 @@ bool LLMessageSystem::generateDigestForWindow(char* digest, const S32 window) co LL_ERRS("Messaging") << "Trying to generate simple digest on a machine without a shared secret!" << llendl; } - U32 now = time(NULL); + U32 now = (U32)time(NULL); now /= window; |