diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
commit | d844da2a6c5fc1a75e606150bb070fdb787698d3 (patch) | |
tree | 349ecda36a5a561d6e564e2cc3db39121fd8946b /indra/newview/llviewerpartsim.cpp | |
parent | 8a74efa38ba631be5400c4912a6339310968c9d7 (diff) | |
parent | 7d05ade3f10563e8c202106e00cb3d273ab13338 (diff) |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
to pick up new merge from main.
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
-rw-r--r-- | indra/newview/llviewerpartsim.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index e5265f1dcd..449fd4ba43 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -716,7 +716,7 @@ void LLViewerPartSim::updateSimulation() if (upd && vobj && (vobj->getPCode() == LL_PCODE_VOLUME)) { - if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex()) + if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex() && vobj->getAvatar()->isTooSlow()) { upd = FALSE; } |