diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
commit | 2e144ecbb2cc7676cfb9f5ab46a2f63c8af85d85 (patch) | |
tree | 0296876c167d0bec11434394157b4a5b1c0b63a5 /indra/llui/llcheckboxctrl.h | |
parent | 1b5f0590ce45ce6e540d266a8902af5839885cfb (diff) | |
parent | 33ad8db77584c66496f261a1cfd9aa535462a003 (diff) |
Merge branch 'main' into nat/releaseos following Maint X promotion
Diffstat (limited to 'indra/llui/llcheckboxctrl.h')
-rw-r--r-- | indra/llui/llcheckboxctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 43e887fab6..f2b61db308 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -117,7 +117,7 @@ public: std::string getLabel() const; void setFont( const LLFontGL* font ) { mFont = font; } - const LLFontGL* getFont() { return mFont; } + const LLFontGL* getFont() const { return mFont; } virtual void setControlName(const std::string& control_name, LLView* context); |