diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
commit | 428f21cf795f440f69a772b314f877ea0c6d4741 (patch) | |
tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/newview/llmodelpreview.h | |
parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) |
Merge branch 'main' into marchcat/x-merge
Diffstat (limited to 'indra/newview/llmodelpreview.h')
-rw-r--r-- | indra/newview/llmodelpreview.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index f68cec4441..a62c3a5ab0 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -310,7 +310,6 @@ protected: vv_LLVolumeFace_t mBaseModelFacesCopy; U32 mGroup; - std::map<LLPointer<LLModel>, U32> mObject; // Amount of triangles in original(base) model U32 mMaxTriangleLimit; |