diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
| commit | 8a74efa38ba631be5400c4912a6339310968c9d7 (patch) | |
| tree | 9a76f8b2b31b3184857e29b965beb922fc166772 /indra/newview | |
| parent | 25c20354b72343410ba0c6e4575a9fbc0671712d (diff) | |
| parent | ed92f1d8034dcaa84f808b3267c772202e7ce113 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
for strip_deprecated_header(header_size) and Python llsd module fixes.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 18420a2356..3e7f79b60a 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1861,8 +1861,8 @@ 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) { llssize dsize = data_size; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 89481add29..8a6a9b7b68 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -49,7 +49,7 @@ viewer_dir = os.path.dirname(__file__) # indra.util.llmanifest under their system Python! sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python")) from indra.util.llmanifest import LLManifest, main, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError, MissingError -from llbase import llsd +import llsd class ViewerManifest(LLManifest): def is_packaging_viewer(self): |