diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-17 15:50:27 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-17 15:50:27 +0300 |
| commit | 7a0a580eddf4fb7608d1bd84b7eccd2653075184 (patch) | |
| tree | f2e7b2c5277b6609c33085599d6cf74f1c1edb89 /indra/llui/llmultislider.cpp | |
| parent | 430c5cd23558ba42c7da0e31845a3677e66f1fed (diff) | |
MAINT-8344 Prevent multislider from locking in infinit cycle
Diffstat (limited to 'indra/llui/llmultislider.cpp')
| -rw-r--r-- | indra/llui/llmultislider.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index 0aa3e17075..aab77c2bd8 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -334,10 +334,15 @@ void LLMultiSlider::deleteSlider(const std::string& name) void LLMultiSlider::clear() { - while(mThumbRects.size() > 0) { + while(mThumbRects.size() > 0 && mValue.size() > 0) { deleteCurSlider(); } + if (mThumbRects.size() > 0 || mValue.size() > 0) + { + LL_WARNS() << "Failed to fully clear Multi slider" << LL_ENDL; + } + LLF32UICtrl::clear(); } |