diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
| commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
| tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/newview/llmeshrepository.cpp | |
| parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
| parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) | |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
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 2118ee74d3..e7f1f7baa4 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; |