diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-07-18 16:48:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 16:48:33 -0700 |
| commit | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (patch) | |
| tree | 82a2b75f4d6ff4650877b774559558065e9ab81a /indra/newview/llmeshrepository.cpp | |
| parent | 8e3d4048d4197a40009f04169aeb3ec710cd6fa1 (diff) | |
| parent | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (diff) | |
Merge pull request #292 from secondlife/brad/DRTVWR-559-xcode-14.3
Merge xcode-14.3 compatibility branch into DRTVWR-559
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 9ccb42cdc5..adeb7ed063 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1862,10 +1862,10 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes LLMeshHeader 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; |