diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-09 17:57:23 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-09 17:57:23 -0700 |
| commit | a7fde9d79c517bfc6165756c1bc3eb16fa4d935c (patch) | |
| tree | f0608f7f72f23a447778f8bce6f210eb221ebdf1 /indra/llui/lliconctrl.h | |
| parent | ac330f63fd7ac655bbd06ce5d4ed65430aa2f42a (diff) | |
| parent | c106221726c48a4231b7854bff224ae422c0517f (diff) | |
Merge remote-tracking branch release/2024.06-atlasaurus into 'develop'
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rw-r--r-- | indra/llui/lliconctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index aae1d1d572..29d3f0c3d4 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -79,7 +79,7 @@ public: std::string getImageName() const; - void setColor(const LLColor4& color) { mColor = color; } + void setColor(const LLUIColor& color) { mColor = color; } void setImage(LLPointer<LLUIImage> image) { mImagep = image; } const LLPointer<LLUIImage> getImage() { return mImagep; } |