diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:50 +0800 |
| commit | 0a11db8b5d0ace1b83c1b542bc966913fecb3f2a (patch) | |
| tree | 3ab0baf0cc0d0a281f21be67ffcae7bc770c17a1 /indra/newview/llmeshrepository.cpp | |
| parent | f900a9ae67c61b3e53c36c119440cbc3710a2f7c (diff) | |
| parent | a31b7ae2419b4f644ddf559274f650e34212338e (diff) | |
Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' into 2025.04
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 |