diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-19 06:52:51 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-19 06:52:51 +0800 |
| commit | b96c9ee1f9f8c1bcdda48638bba3e31a90887f86 (patch) | |
| tree | c6c292132fab5820e24a69913bc50e09ca6883af /indra/newview/llface.h | |
| parent | 238c6512a7a6f8cb8bbea71ef612c91526c15f77 (diff) | |
| parent | 97ee8b207bf43a8acb3f2702d26eb5f3b7471e45 (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 0a66dc6ba6..eb3b47d6d6 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -156,10 +156,12 @@ public: void updateRebuildFlags(); bool canRenderAsMask(); // logic helper BOOL getGeometryVolume(const LLVolume& volume, - const S32 &f, - const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, - const U16 &index_offset, - bool force_rebuild = false); + S32 face_index, + const LLMatrix4& mat_vert, + const LLMatrix3& mat_normal, + U16 index_offset, + bool force_rebuild = false, + bool no_debug_assert = false); // For avatar U16 getGeometryAvatar( |