diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/llmessage/message.cpp | |
parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) |
Merge pull from vir/drano
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; |