Skip to content

#4081 Meshes missing after teleport #4084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025
+1 −14
Merged

#4081 Meshes missing after teleport #4084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions indra/newview/llmeshrepository.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions indra/newview/llviewerregion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3720,12 +3720,6 @@ bool LLViewerRegion::bakesOnMeshEnabled() const
mSimulatorFeatures["BakesOnMeshEnabled"].asBoolean());
}

bool LLViewerRegion::meshRezEnabled() const
{
return (mSimulatorFeatures.has("MeshRezEnabled") &&
mSimulatorFeatures["MeshRezEnabled"].asBoolean());
}

bool LLViewerRegion::dynamicPathfindingEnabled() const
{
return ( mSimulatorFeatures.has("DynamicPathfindingEnabled") &&
Expand Down
1 change: 0 additions & 1 deletion indra/newview/llviewerregion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ class LLViewerRegion: public LLCapabilityProvider // implements this interface

void getInfo(LLSD& info);

bool meshRezEnabled() const;
bool meshUploadEnabled() const;

bool bakesOnMeshEnabled() const;
Expand Down