#6211 Fix environment crashes - #6212
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to prevent environment-related crashes during shutdown and improve shader fallback behavior when shader compilation/linking fails.
Changes:
- Pass the application quitting state into
closeFloater(...)when asset loading fails in the environment editor floater. - Add
LLApp::isQuitting()early-return guards in environment asset-load callbacks to avoid applying environments during shutdown. - Drain OpenGL errors before retrying shader creation at a lower shader level to improve fallback reliability.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| indra/newview/llfloatereditenvironmentbase.cpp | Ensures floater closure respects app quitting state when settings fail to load. |
| indra/newview/llenvironment.cpp | Adds shutdown guards in async environment asset-load callbacks to avoid work during quitting. |
| indra/llrender/llglslshader.cpp | Drains GL errors before retrying shader creation to support fallback to lower shader levels. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
akleshchev
force-pushed
the
andreyk/viewer_6211
branch
from
August 28, 2026 08:46
c083023 to
24a5420
Compare
maxim-productengine
approved these changes
Aug 28, 2026
When loading environment (sun) shader, user got silent failures on retry
akleshchev
force-pushed
the
andreyk/viewer_6211
branch
from
August 28, 2026 16:40
24a5420 to
c634689
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.