summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2023-07-17 21:56:19 +0300
committerGitHub <noreply@github.com>2023-07-17 21:56:19 +0300
commitf60bf987392af04daa8527ed099f31727c629d06 (patch)
treee75c474ded03bf8d21c038fc9883cf18adee065d /indra/llcommon
parent6f1e7d58e32bc281c981fb0229c84a2cbf6eece2 (diff)
parentd501c24367a0ea189f3786e119aa03565aecd39e (diff)
Merge pull request #242 from secondlife/brad/actions
SL-18837 set build id based on github workflow run id
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llprocessor.cpp2
-rw-r--r--indra/llcommon/llrand.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 4a1a81f083..28f8bc2b93 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -746,7 +746,7 @@ private:
__cpuid(0x1, eax, ebx, ecx, edx);
if(feature_infos[0] != (S32)edx)
{
- LL_ERRS() << "machdep.cpu.feature_bits doesn't match expected cpuid result!" << LL_ENDL;
+ LL_WARNS() << "machdep.cpu.feature_bits doesn't match expected cpuid result!" << LL_ENDL;
}
#endif // LL_RELEASE_FOR_DOWNLOAD
diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index cb28a8f5c3..1b6963a9dd 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -82,7 +82,7 @@ static LLSeedRand sRandomSeeder;
inline F64 ll_internal_random_double()
{
#if LL_WINDOWS
- return (F64)rand() / (F64)RAND_MAX;
+ return (F64)rand() / (F64)(RAND_MAX+1);
#else
return drand48();
#endif
@@ -90,7 +90,7 @@ inline F64 ll_internal_random_double()
inline F32 ll_internal_random_float()
{
#if LL_WINDOWS
- return (F32)rand() / (F32)RAND_MAX;
+ return (F32)rand() / (F32)(RAND_MAX+1);
#else
return (F32)drand48();
#endif