summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-05-19 17:38:06 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-05-19 17:38:06 -0400
commit041005f2860808bb807483775635abcd8c54fecf (patch)
tree57cce285218550dd2c0378ac8bf0c1c1d856701e /indra/newview/llmeshrepository.cpp
parent1be9d68468e51be7de5b632f0276dc6708e75dc6 (diff)
parentb61ea595b5f2cac0f108b05526f0a371f512bfd4 (diff)
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rw-r--r--indra/newview/llmeshrepository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f937754368..18420a2356 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1865,7 +1865,7 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
U32 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;