diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-04 04:50:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-04 04:50:28 +0300 |
| commit | 44503282f6535d988138737f5280cae1350b5869 (patch) | |
| tree | 3ec1bbad9bca2d368c6ce6c99a203320d947a26a /indra/llui | |
| parent | 3790c9ed879b015bcc91f3a9c393fbda643aa62f (diff) | |
| parent | e4906b2ab9922453b1f29d2a29b4306c2722cd1a (diff) | |
Merge remote-tracking branch 'loque-viewer/DRTVWR-580-maint-T' into marchcat/SL-19669-upd
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index c567451973..521dabf9d4 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -171,7 +171,8 @@ void LLTextBox::reshapeToFitText(BOOL called_from_parent) S32 width = getTextPixelWidth(); S32 height = getTextPixelHeight(); - reshape( width + 2 * mHPad, height + 2 * mVPad, called_from_parent ); + //consider investigating reflow() to find missing width pixel (see SL-17045 changes) + reshape( width + 2 * mHPad + 1, height + 2 * mVPad, called_from_parent ); } diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index b84bb13edb..096336045c 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -230,7 +230,7 @@ void LLUIColorTable::saveUserSettings() const { // Compare user color value with the default value, skip if equal string_color_map_t::const_iterator itd = mLoadedColors.find(it->first); - if(itd != mUserSetColors.end() && itd->second == it->second) + if(itd != mLoadedColors.end() && itd->second == it->second) continue; ColorEntryParams color_entry; |