diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
| commit | 5440464a9cbff6f64f79667ac026a7a1983b28b4 (patch) | |
| tree | 26a643a95e6aa99995ce728e4d2bf21cbdaa2c59 /indra/newview/llexpandabletextbox.cpp | |
| parent | 717fe2cc5c35151f4712519f649276d4877d09a3 (diff) | |
| parent | d58b530e805e2b3c943b1ff446ac84a10c500b32 (diff) | |
Merge branch 'contribution/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; } |