Skip to content

#4460 debug text cannot be scrolled #4461

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
merged 1 commit into from
Jul 30, 2025
Merged

#4460 debug text cannot be scrolled #4461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions indra/newview/llfloatersettingsdebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
mSettingNameText->setToolTip(controlp->getName());
mComment->setVisible(true);

std::string old_text = mComment->getText();
std::string new_text = controlp->getComment();
// Don't setText if not nessesary, it will reset scroll
// This is a debug UI that reads from xml, there might
// be use cases where comment changes, but not the name
if (old_text != new_text)
if (mOldText != new_text)
{
mComment->setText(controlp->getComment());
mOldText = new_text;
}

mValSpinner1->setMaxValue(F32_MAX);
Expand Down Expand Up @@ -467,6 +467,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
}
default:
mComment->setText(std::string("unknown"));
mOldText = "unknown";
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions indra/newview/llfloatersettingsdebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class LLFloaterSettingsDebug final
LLColorSwatchCtrl* mColorSwatch = nullptr;

std::string mSearchFilter;
std::string mOldText;
};

#endif //LLFLOATERDEBUGSETTINGS_H
Expand Down
10 changes: 5 additions & 5 deletions indra/newview/skins/default/xui/en/floater_test_slapp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
width="500">
<floater.string
name="remove_folder_slapp">
secondlife://app/remove_folder/?folder_id=
secondlife:///app/remove_folder/?folder_id=
</floater.string>
<text
type="string"
Expand Down Expand Up @@ -42,7 +42,7 @@
width="450"
layout="topleft"
left="16">
secondlife://app/wear_folder/?folder_name=Daisy
secondlife:///app/wear_folder/?folder_name=Daisy
</text>
<text
type="string"
Expand All @@ -63,7 +63,7 @@
width="450"
layout="topleft"
left="16">
secondlife://app/add_folder/?folder_name=Cardboard%20Boxbot
secondlife:///app/add_folder/?folder_name=Cardboard%20Boxbot
</text>
<text
type="string"
Expand All @@ -73,7 +73,7 @@
height="16"
width="450"
layout="topleft">
secondlife://app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
secondlife:///app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
</text>
<text
type="string"
Expand Down Expand Up @@ -118,6 +118,6 @@
name="remove_folder_txt"
layout="topleft"
left="16">
secondlife://app/remove_folder/?folder_id=
secondlife:///app/remove_folder/?folder_id=
</text>
</floater>
Loading