Skip to content

Reduce LLFolderView per-item memory + fix three folderview defects #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyeMutt merged 3 commits into from
Jun 10, 2026
Merged

Reduce LLFolderView per-item memory + fix three folderview defects #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afae804
Fix LLUICtrl control-variable signal leak; trim base-widget memory
RyeMutt Jun 9, 2026
de88742
Reduce LLFolderView per-item memory + fix three folderview defects
RyeMutt Jun 9, 2026
61ccaf9
Invalidate cached suffix geometry in LLFolderViewItem::refreshSuffix
RyeMutt Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions indra/llui/llcombobox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ void LLComboBox::initFromParams(const LLComboBox::Params& p)
// virtual
bool LLComboBox::postBuild()
{
if (mControlVariable)
if (getControlVariable())
{
setValue(mControlVariable->getValue()); // selects the appropriate item
setValue(getControlVariable()->getValue()); // selects the appropriate item
}
return true;
}
Expand Down Expand Up @@ -278,9 +278,9 @@ LLScrollListItem* LLComboBox::add(const std::string& name, EAddPosition pos, boo
item->setEnabled(enabled);
if (!mAllowTextEntry && mLabel.empty())
{
if (mControlVariable)
if (getControlVariable())
{
setValue(mControlVariable->getValue()); // selects the appropriate item
setValue(getControlVariable()->getValue()); // selects the appropriate item
}
else
{
Expand All @@ -297,9 +297,9 @@ LLScrollListItem* LLComboBox::add(const std::string& name, const LLUUID& id, EAd
item->setEnabled(enabled);
if (!mAllowTextEntry && mLabel.empty())
{
if (mControlVariable)
if (getControlVariable())
{
setValue(mControlVariable->getValue()); // selects the appropriate item
setValue(getControlVariable()->getValue()); // selects the appropriate item
}
else
{
Expand All @@ -317,9 +317,9 @@ LLScrollListItem* LLComboBox::add(const std::string& name, void* userdata, EAddP
item->setUserdata( userdata );
if (!mAllowTextEntry && mLabel.empty())
{
if (mControlVariable)
if (getControlVariable())
{
setValue(mControlVariable->getValue()); // selects the appropriate item
setValue(getControlVariable()->getValue()); // selects the appropriate item
}
else
{
Expand All @@ -336,9 +336,9 @@ LLScrollListItem* LLComboBox::add(const std::string& name, LLSD value, EAddPosit
item->setEnabled(enabled);
if (!mAllowTextEntry && mLabel.empty())
{
if (mControlVariable)
if (getControlVariable())
{
setValue(mControlVariable->getValue()); // selects the appropriate item
setValue(getControlVariable()->getValue()); // selects the appropriate item
}
else
{
Expand Down
10 changes: 5 additions & 5 deletions indra/llui/llfolderview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ LLFolderView::LLFolderView(const Params& p)
mAutoOpenCandidate = NULL;
mAutoOpenTimer.stop();
mKeyboardSelection = false;
mIndentation = getParentFolder() ? getParentFolder()->getIndentation() + mLocalIndentation : 0;
mIndentation = getParentFolder() ? getParentFolder()->getIndentation() + mStyle->localIndentation : 0;

//clear label
// go ahead and render root folder as usual
Expand All @@ -230,11 +230,11 @@ LLFolderView::LLFolderView(const Params& p)
// Textbox
LLTextBox::Params text_p;
LLFontGL* font = getLabelFontForStyle(mLabelStyle);
//mIconPad, mTextPad are set in folder_view_item.xml
LLRect new_r = LLRect(rect.mLeft + mIconPad,
rect.mTop - mTextPad,
//icon_pad, text_pad are set in folder_view_item.xml (shared via mStyle)
LLRect new_r = LLRect(rect.mLeft + mStyle->iconPad,
rect.mTop - mStyle->textPad,
rect.mRight,
rect.mTop - mTextPad - font->getLineHeight());
rect.mTop - mStyle->textPad - font->getLineHeight());
text_p.rect(new_r);
text_p.name(std::string(p.name));
text_p.font(font);
Expand Down
Loading