summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2024-08-13 13:14:17 -0500
committerGitHub <noreply@github.com>2024-08-13 11:14:17 -0700
commit2cc21e982668750b237edf2c54979f58d1c52203 (patch)
tree3d973b7a5b60fe27492c93abda545a16fd468a18
parentd696010cea1dd0abf6821d6756bc1f33a955cb3f (diff)
Fix for coroutine assert rooted in coroRequestEnvironment (#2276)
-rw-r--r--indra/newview/llenvironment.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 5dfaf176fd..6e31760e9e 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2123,8 +2123,11 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ
LLSD environment = result[KEY_ENVIRONMENT];
if (environment.isDefined() && apply)
{
- EnvironmentInfo::ptr_t envinfo = LLEnvironment::EnvironmentInfo::extract(environment);
- apply(parcel_id, envinfo);
+ LLAppViewer::instance()->postToMainCoro([=]()
+ {
+ EnvironmentInfo::ptr_t envinfo = LLEnvironment::EnvironmentInfo::extract(environment);
+ apply(parcel_id, envinfo);
+ });
}
}