diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
| commit | 8631a7a07743af00431c6f33361ab06405bcf114 (patch) | |
| tree | e7d983394f5ca0cbe2465780e8205cf32ba67ad3 /indra/llui/llscrolllistctrl.cpp | |
| parent | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with tip of Master after a Viewer release
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index be85f1cb6a..de644185fd 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -743,12 +743,12 @@ void LLScrollListCtrl::updateColumns(bool force_update) LLScrollColumnHeader* last_header = NULL; for (column_ordered_it = mColumnsIndexed.begin(); column_ordered_it != mColumnsIndexed.end(); ++column_ordered_it) { - if ((*column_ordered_it)->getWidth() < 0) + LLScrollListColumn* column = *column_ordered_it; + if (!column || column->getWidth() < 0) { // skip hidden columns continue; } - LLScrollListColumn* column = *column_ordered_it; if (column->mHeader) { |