summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrl.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 22:37:41 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-19 22:37:41 +0300
commitaaaf3189c400e491c6adc533f8b03dfecddb1dd9 (patch)
tree57872267bb777945a568574ee19bcda578738d76 /indra/llui/lluictrl.h
parent847cce915dd54166ca3b4fd6bfb8b3c697433abf (diff)
parentb86fdf1c316a49bab69d7ef6b3751565bedf8f59 (diff)
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
Diffstat (limited to 'indra/llui/lluictrl.h')
-rw-r--r--indra/llui/lluictrl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 63baed6793..7360bd7659 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -213,7 +213,8 @@ public:
virtual void setColor(const LLColor4& color);
- F32 getCurrentTransparency();
+ // Ansariel: Changed to virtual. We might want to change the transparency ourself!
+ virtual F32 getCurrentTransparency();
void setTransparencyType(ETypeTransparency type);
ETypeTransparency getTransparencyType() const {return mTransparencyType;}