summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-08-16 08:25:50 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-08-16 08:25:50 -0400
commit6cf6f81ae865d4e15b715a93408c7970b6936ce8 (patch)
treec8232f05b4fb6ae8551d44d11517e89454be55ef /indra/newview/llmeshrepository.cpp
parent5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff)
parent48aecb5c8d10926caa62feb94231c3019162836a (diff)
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rw-r--r--indra/newview/llmeshrepository.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f937754368..3e7f79b60a 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1861,11 +1861,11 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
{
const LLUUID mesh_id = mesh_params.getSculptID();
LLSD header;
-
- U32 header_size = 0;
+
+ size_t header_size = 0;
if (data_size > 0)
{
- U32 dsize = data_size;
+ llssize dsize = data_size;
char* result_ptr = strip_deprecated_header((char*)data, dsize, &header_size);
data_size = dsize;