diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-10-04 08:45:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-10-04 08:45:47 -0400 |
| commit | c26123e11f576a43a3bbe3125e86814038096f74 (patch) | |
| tree | 383c0101a79348e59037c854c3418571e05694d7 /indra/llui/llbutton.cpp | |
| parent | e2ea42cb6a078d250a5d1c7ee81be355bde669bc (diff) | |
| parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
SL-18837: Merge branch 'main' of secondlife/viewer into actions
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 3354cb2db3..49d275997a 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -203,7 +203,8 @@ LLButton::LLButton(const LLButton::Params& p) } // Hack to make sure there is space for at least one character - if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" "))) + if (getRect().mRight >= 0 && getRect().getWidth() > 0 && + getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" "))) { // Use old defaults mLeftHPad = llbutton_orig_h_pad; |