Fix for coroutine assert rooted in coroRequestEnvironment (#2276)

RunitaiLinden · web-flow · commit 2cc21e982668 · 2024-08-13T11:14:17.000-07:00
diff --git 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);
+                });
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2123,8 +2123,11 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ`
`2123`	`2123`	`LLSD environment = result[KEY_ENVIRONMENT];`
`2124`	`2124`	`if (environment.isDefined() && apply)`
`2125`	`2125`	`{`
`2126`		`- EnvironmentInfo::ptr_t envinfo = LLEnvironment::EnvironmentInfo::extract(environment);`
`2127`		`- apply(parcel_id, envinfo);`
	`2126`	`+ LLAppViewer::instance()->postToMainCoro([=]()`
	`2127`	`+ {`
	`2128`	`+ EnvironmentInfo::ptr_t envinfo = LLEnvironment::EnvironmentInfo::extract(environment);`
	`2129`	`+ apply(parcel_id, envinfo);`
	`2130`	`+ });`
`2128`	`2131`	`}`
`2129`	`2132`	`}`
`2130`	`2133`