diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
| commit | f975cfd7361729195f2bb14d874e5eacc6140759 (patch) | |
| tree | 471389ca5dab742aaf84c678c4dcef3433da8e9a /indra/llui/lliconctrl.h | |
| parent | 2f8f1c7a44f45490db5b5f040914e42aef2f5280 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rw-r--r-- | indra/llui/lliconctrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 9c3b517bca..5d6c544571 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -72,6 +72,7 @@ public: virtual BOOL handleHover(S32 x, S32 y, MASK mask); // lluictrl overrides + void onVisibilityChange(BOOL new_visibility); virtual void setValue(const LLSD& value ); std::string getImageName() const; @@ -95,6 +96,8 @@ protected: bool mInteractable; private: + void loadImage(const LLSD& value, S32 priority); + LLUIColor mColor; LLPointer<LLUIImage> mImagep; }; |