diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-16 19:05:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-16 19:05:57 -0400 |
| commit | bb76eae4b814e612ff2b0c62fffc6c3263058d64 (patch) | |
| tree | 32818e0c938b465bf39c976955864a14b3bb512e /indra/newview/llmeshrepository.cpp | |
| parent | 2efe514f14a0f0b405599301a14413edfce873ee (diff) | |
| parent | d5313e7161bb99045adc4a1a34d7f85de609d97b (diff) | |
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 851107b3be..e7e95034b2 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -5976,13 +5976,7 @@ bool LLMeshRepository::meshUploadEnabled() bool LLMeshRepository::meshRezEnabled() { static LLCachedControl<bool> mesh_enabled(gSavedSettings, "MeshEnabled"); - LLViewerRegion *region = gAgent.getRegion(); - if(mesh_enabled && - region) - { - return region->meshRezEnabled(); - } - return false; + return mesh_enabled; } // Threading: main thread only |