diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:42:14 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:57:11 +0300 |
| commit | ade8c96e5c68f672d33802f4a82ce46ccffd7816 (patch) | |
| tree | 0f8c75d3657ce11c38a8d98b081b3b08b64de104 /indra/newview/llviewerpartsim.cpp | |
| parent | 002ff88a130b16f03e26e159f7ea5f38782b16b6 (diff) | |
| parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) | |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappviewer.cpp
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; } |