diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 15:17:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:24:59 +0800 |
| commit | 96a81b5ecbe3bffb582ded930752c0523df5e80a (patch) | |
| tree | a87a0bd09fd980562e88150dbfea3819d28d9f12 /indra/newview/llphysicsshapebuilderutil.h | |
| parent | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff) | |
| parent | ed73208eb96b862b97fa285036edea1e792ca3c6 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llphysicsshapebuilderutil.h')
| -rw-r--r-- | indra/newview/llphysicsshapebuilderutil.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llphysicsshapebuilderutil.h b/indra/newview/llphysicsshapebuilderutil.h index 25b44bbbb5..01c173523b 100644 --- a/indra/newview/llphysicsshapebuilderutil.h +++ b/indra/newview/llphysicsshapebuilderutil.h @@ -73,7 +73,8 @@ public: { return LLVolumeParams::operator<(params); } - return (params.mForceConvex == false) && (mForceConvex == true); + + return !params.mForceConvex && mForceConvex; } bool shouldForceConvex() const { return mForceConvex; } |