diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/llmath/llrigginginfo.cpp | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/llmath/llrigginginfo.cpp')
| -rw-r--r-- | indra/llmath/llrigginginfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llrigginginfo.cpp b/indra/llmath/llrigginginfo.cpp index 0de07950c1..23dbddd78e 100644 --- a/indra/llmath/llrigginginfo.cpp +++ b/indra/llmath/llrigginginfo.cpp @@ -46,7 +46,7 @@ void LLJointRiggingInfo::setIsRiggedTo(bool val) { mIsRiggedTo = val; } - + LLVector4a *LLJointRiggingInfo::getRiggedExtents() { return mRiggedExtents; @@ -120,8 +120,8 @@ void LLJointRiggingInfoTab::clear() void showDetails(const LLJointRiggingInfoTab& src, const std::string& str) { - S32 count_rigged = 0; - S32 count_box = 0; + S32 count_rigged = 0; + S32 count_box = 0; LLVector4a zero_vec; zero_vec.clear(); for (S32 i=0; i<src.size(); i++) |