diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
| commit | b9cd6e2e84f9c4161f0151b9f0cee1fcb309d8d7 (patch) | |
| tree | d92a175355a53fc03d1f50a9aa4eca71787a027c /indra/newview/llmeshrepository.cpp | |
| parent | 74b8ca575ff7f0cfcfd443e03885542bc5b10c46 (diff) | |
| parent | 626bbe5032cab1fd2641ad02443e421567e7cce5 (diff) | |
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.h
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e2fb218b1b..ff888a5af2 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1866,7 +1866,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; |