From 4c3f343799ca4be4b618dca8cf13a86e8941fb44 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 26 Jul 2022 19:40:10 +0300 Subject: SL-17045 LSL editor cursor position desynchronization 1. Fixed cursor position calculations 2. Fixed selection rect calculation --- indra/llprimitive/llmodel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 3881b1338c..599f19a2a3 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -56,6 +56,8 @@ public: mutable std::vector mJointNums; typedef std::vector> matrix_list_t; matrix_list_t mInvBindMatrix; + + // bones/joints position overrides matrix_list_t mAlternateBindMatrix; LL_ALIGN_16(LLMatrix4a mBindShapeMatrix); -- cgit v1.2.3 From 70009d21b2dd51c2c3cc6d9195e048051ca00699 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 3 Aug 2022 01:46:01 +0300 Subject: SL-17890 Face creation does not clean used arrays --- indra/llprimitive/lldaeloader.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index e89690438e..7a138578a5 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -330,7 +330,10 @@ LLModel::EModelStatus load_face_from_dom_triangles( // VFExtents change face.mExtents[0].set(v[0], v[1], v[2]); face.mExtents[1].set(v[0], v[1], v[2]); - point_map.clear(); + + verts.clear(); + indices.clear(); + point_map.clear(); } } -- cgit v1.2.3