diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
index cab991b6df..af124d9826 100755
--- a/indra/llui/llscrolllistcolumn.cpp
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -236,11 +236,6 @@ void LLScrollColumnHeader::handleReshape(const LLRect& new_rect, bool by_user)
// tell scroll list to layout columns again
// do immediate update to get proper feedback to resize handle
// which needs to know how far the resize actually went
- // FIRE-8911/MAINT-2223: Fix for broken column resize
- // Need to set mColumnsDirty via dirtyColumns() first
- // or nothing would happen at all!
- mColumn->mParentCtrl->dirtyColumns();
- //
mColumn->mParentCtrl->updateColumns();
}
}
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 932bf92a23..ddb59bc9c8 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -647,12 +647,7 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
if (mColumnWidthsDirty)
{
- // FIRE-8911/MAINT-2223: Fix for broken column resize
- // This seems to be misplaced here as we would only
- // take the first column into account for max
- // content width calculation.
- //mColumnWidthsDirty = false;
- //
+ mColumnWidthsDirty = false;
// update max content width for this column, by looking at all items
column->mMaxContentWidth = column->mHeader ? LLFontGL::getFontSansSerifSmall()->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
item_list::iterator iter;
@@ -666,9 +661,6 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
}
max_item_width += column->mMaxContentWidth;
}
- // FIRE-8911/MAINT-2223: Fix for broken column resize
- mColumnWidthsDirty = false;
- //
return max_item_width;
}
@@ -693,17 +685,11 @@ bool LLScrollListCtrl::updateColumnWidths()
new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns;
}
- // FIRE-8911/MAINT-2223: Fix for broken column resize
- // This apparently doesn't work as it should, preventing
- // a proper resize. Fall back to pre-3.4.3 behavior and
- // always assume a changed width.
- //if (column->getWidth() != new_width)
- //{
- // column->setWidth(new_width);
- // width_changed = true;
- //}
- width_changed = true;
- //
+ if (column->getWidth() != new_width)
+ {
+ column->setWidth(new_width);
+ width_changed = true;
+ }
}
return width_changed;
}