diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
commit | 9463f10b3332d34655006f4ba5127b114ca6e0c3 (patch) | |
tree | 2e5e3226fbae28cba66e473edc09ccc9f8bd50cf /indra/newview/llenvironment.cpp | |
parent | 7137647e90d8c11197513f542f04fb39b483d663 (diff) | |
parent | b1098308428873e927cbf3c956ed0a7f17dc439b (diff) |
Merge branch 'release/luau-scripting' into lua-timers after Maint X
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r-- | indra/newview/llenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 98260ec149..641c613ec1 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -2112,7 +2112,7 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ { LL_WARNS("ENVIRONMENT") << "Couldn't retrieve environment settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL; } - else if (LLApp::isExiting()) + else if (LLApp::isExiting() || gDisconnected) { return; } |