diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-07-17 23:34:59 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-07-17 23:34:59 +0300 |
| commit | acf82867b61535b7b39b89f71a282e3ce3d0673e (patch) | |
| tree | 2795aa7a92d291d5535d935ab0782cfdf6ec45e4 /indra/llrender/llfontgl.h | |
| parent | d3233e787aaf1ba0558a714d5216ea70c7249c36 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 9608b7ea91..9bbf9ce0c4 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -138,7 +138,7 @@ public: F32 getWidthF32(const std::string& utf8text) const; F32 getWidthF32(const llwchar* wchars) const; F32 getWidthF32(const std::string& text, S32 offset, S32 max_chars ) const; - F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars) const; + F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars, bool no_padding = false) const; // The following are called often, frequently with large buffers, so do not use a string interface |