summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-04-16 15:25:25 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-04-16 15:25:25 -0400
commit78d985c154b0d71064b89891f5b2005e48c300ce (patch)
treec43bc6be58ec9b30f0f4dfaa6c027736fb331582 /indra/llcorehttp
parent6c2a278c3dbd9d0660be5e9f6ec1c756af7cb992 (diff)
parenta3cbd41543258818589dd0e368c68d2dc62b3398 (diff)
Merge branch 'main' into release/luau-scripting
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/bufferarray.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index 8d2e7c6a63..c780c06b4e 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -288,7 +288,7 @@ int BufferArray::findBlock(size_t pos, size_t * ret_offset)
if (pos >= mLen)
return -1; // Doesn't exist
- const int block_limit(narrow(mBlocks.size()));
+ const int block_limit(narrow<size_t>(mBlocks.size()));
for (int i(0); i < block_limit; ++i)
{
if (pos < mBlocks[i]->mUsed)