diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-06 16:40:00 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-06 16:40:00 +0300 |
| commit | 2795fe9786c96b057dee4ce6f4fd1504117e6f78 (patch) | |
| tree | b88e8b0ae7f62a51bd0df0894a61d1fb97f8235b /indra/llui/lluictrl.h | |
| parent | fd15b4309b126fd5f83f2091c060a6043e18fdbf (diff) | |
| parent | 75455d101c9535d0d45aa0f505f888f4ba3de64d (diff) | |
Merge branch 'develop' into marchcat/b-sync
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llxml/llxmltree.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index fb8fc0c5ea..8cd9950917 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -216,7 +216,7 @@ public: // selected radio button, etc.). Defaults to no-op. virtual void clear(); - virtual void setColor(const LLColor4& color); + virtual void setColor(const LLUIColor& color); // Ansariel: Changed to virtual. We might want to change the transparency ourself! virtual F32 getCurrentTransparency(); |