diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-05-18 21:21:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-18 21:21:44 +0300 |
| commit | fdeef47611e7496ff5d5fb8f37e3b1f5240a8b14 (patch) | |
| tree | aab4b1664b82e8f49395fe3e3a75619724c9fd1c /indra/newview/llmeshrepository.cpp | |
| parent | 3569cc1993dc03637b29fcd77fe5b01b6ea372fb (diff) | |
| parent | a9c75d8136f9df6885e525ea8f2b383fe4a22593 (diff) | |
Merge branch 'geenz/gltf-mesh-import' into marchcat/gltf-mesh-texture-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 |