diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-04 06:08:09 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-04 06:08:09 +0800 |
| commit | a332b8faefef8a044a2409957b415b62d6a85181 (patch) | |
| tree | e76c2d8c9500c700d2d45ea1b4708747854f2f7d /indra/llui/llbutton.cpp | |
| parent | bdfd8198eb8fe7128230d562fe37eafac5c52bec (diff) | |
| parent | f352fd1090ce4d50db349cdadfa61d66783a20e8 (diff) | |
Merge tag '6.6.15-release'
source for viewer 6.6.15.581961
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; |