diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 23:17:19 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 23:17:19 +0200 |
| commit | 8ff51bdeb2e27187630fa6d76513f6e10f598114 (patch) | |
| tree | 235636bcec8aa8b35a1c5de56a82e12c9851f20a /indra/llcharacter | |
| parent | a1931d8cc4820eb4e20f1346fc7c3e0139c5863b (diff) | |
| parent | 8ec8732ec9a6dd109b3d40762148f0c951566e9b (diff) | |
Merge branch 'contribute' into DRTVWR-577-maint-S
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llbvhloader.cpp | 2 | ||||
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index 47c6d6a7bb..117d408b21 100644 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -949,7 +949,6 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 & //------------------------------------------------------------------------ void LLBVHLoader::applyTranslations() { - JointVector::iterator ji; for (Joint* joint : mJoints) { //---------------------------------------------------------------- @@ -1064,7 +1063,6 @@ void LLBVHLoader::optimize() mEaseOut *= factor; } - JointVector::iterator ji; for (Joint* joint : mJoints) { BOOL pos_changed = FALSE; diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 280641a1a5..06f3bedf85 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -720,7 +720,6 @@ void LLJoint::showAttachmentScaleOverrides(const std::string& av_info) const { LL_DEBUGS("Avatar") << "no conflicts" << LL_ENDL; } - std::set<LLVector3>::iterator dit = distinct_offsets.begin(); for (const LLVector3& offset : distinct_offsets) { std::string highlight = (has_active_override && offset == active_override) ? "*" : ""; |