summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-04-20 14:08:23 +0800
committerErik Kundiman <erik@megapahit.org>2024-04-20 14:08:23 +0800
commit23a35d763bca645ce628d80ebd939c979590724c (patch)
tree434e8413c209d8a29fe93ed17ea2717817660a7e /indra/llcorehttp
parent1a4517e5af8f43433fc2547658615dce4073d9a3 (diff)
parent78174fc8658caeddfd8306ec19eb0e1c2975368e (diff)
Merge tag '7.1.5-release'
source for viewer 7.1.5.8443591509
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)