diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
| commit | eb8eaa58a4e28b4db2736000f22fbd97371ef9db (patch) | |
| tree | f27b7dccc4409bce20d9173a6f17d971c689637e /indra/llui | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
| parent | f0ae109b696671c5773a5084a7329d0b164b7735 (diff) | |
Merge storm-2145 dev into lindenlab branch parented from viewer-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lluictrl.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index a245dd8f78..2dcc62ce79 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1,5 +1,4 @@ /** - * @file llfloater.cpp * @brief LLFloater base class * diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 550bee5c70..e53ecd30c2 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -212,7 +212,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;} |