diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 16:05:19 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 16:05:19 +0300 |
| commit | ce9d66cdd18c58c3b26fbebde633ae00732d7f9f (patch) | |
| tree | fdbc5a913c62265f95e610819637e096f0f85339 /indra/llcharacter/lljoint.h | |
| parent | 514b658fde13bb0c0ec862b081eeebf47bace70d (diff) | |
| parent | 0f68bcd46ca3f2babf94303b80e2be006e4693ae (diff) | |
Merge branch develop into 2025.06
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/llcharacter/lljoint.h')
| -rw-r--r-- | indra/llcharacter/lljoint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 763c1e3865..b58dc797f8 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -222,7 +222,7 @@ public: LLJoint *getRoot(); // search for child joints by name - LLJoint *findJoint( const std::string &name ); + LLJoint* findJoint(std::string_view name); // add/remove children void addChild( LLJoint *joint ); |