diff options
author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-03-07 11:46:27 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-07 11:46:27 -0800 |
commit | 6b0b751a207737c06544ac4de13174661b1dcb35 (patch) | |
tree | 95f472eabe4407cca653af3a867808f32402551c /indra/newview/llexpandabletextbox.cpp | |
parent | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (diff) | |
parent | 4072fd84fb201e37827a6a98264fadea18fd30e4 (diff) |
Merge pull request #83 from KittyBarnett/DRTVWR-489-emoji
Drtvwr 489 emoji
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 3395777aab..2d332f75f5 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -88,7 +88,7 @@ public: mStyle->getShadowType(), end - start, draw_rect.getWidth(), &right_x, - mEditor.getUseEllipses()); + mEditor.getUseEllipses(), mEditor.getUseColor()); return right_x; } /*virtual*/ bool canEdit() const { return false; } |