diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-09-02 22:14:42 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-09-04 10:16:46 +0300 |
| commit | 4cc0edb189c4deaa205f986d20a6959aa83fb25c (patch) | |
| tree | 29b94ccfddb625e664ddf072a4351745240cc597 /indra/llui | |
| parent | 57ab1a410f9cb3534bb403e034743505758579d8 (diff) | |
viewer#2411 Cleanup
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llbadge.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llbutton.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llbutton.h | 6 | ||||
| -rw-r--r-- | indra/llui/llscrolllistcell.cpp | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp index 48489db615..c6654ee0aa 100644 --- a/indra/llui/llbadge.cpp +++ b/indra/llui/llbadge.cpp @@ -105,7 +105,6 @@ LLBadge::LLBadge(const LLBadge::Params& p) , mPaddingVert(p.padding_vert) , mParentScroller(NULL) , mDrawAtParentTop(false) - , mFontBuffer(false) { if (mImage.isNull()) { diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index d4e5d501db..387d2c0d07 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -124,7 +124,6 @@ LLButton::Params::Params() LLButton::LLButton(const LLButton::Params& p) : LLUICtrl(p), LLBadgeOwner(getHandle()), - mFontBuffer(false), mMouseDownFrame(0), mMouseHeldDownCount(0), mFlashing( false ), diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 23a3a05e65..6a389f0554 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -253,8 +253,8 @@ public: void setDisabledLabelColor(const LLUIColor& c); void setFont(const LLFontGL* font); - const LLFontGL* getFont() const { return mGLFont; } - const std::string& getText() const { return getCurrentLabel().getString(); } + const LLFontGL* getFont() const override { return mGLFont; } + const std::string& getText() const override { return getCurrentLabel().getString(); } S32 getLastDrawCharsCount() const { return mLastDrawCharsCount; } bool labelIsTruncated() const; @@ -392,7 +392,7 @@ private: LLFontVertexBuffer mFontBuffer; protected: - virtual std::string _getSearchText() const + virtual std::string _getSearchText() const override { return getLabelUnselected() + getToolTip(); } diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index 8b998971b6..a3108d77e8 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -256,7 +256,6 @@ LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p) mText(p.label.isProvided() ? p.label() : p.value().asString()), mAltText(p.alt_value().asString()), mFont(p.font), - mFontBuffer(false), mColor(p.color), mUseColor(p.color.isProvided()), mFontAlignment(p.font_halign), |