diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-06-24 20:48:45 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-06-24 20:48:45 +0000 |
| commit | 3a98311ce76b4dfdc4c4aa7e4639945289b80c6a (patch) | |
| tree | 442eb88e9bb9a3bdf7db457273f0e27ba6c86a46 /indra/llui/lluictrl.h | |
| parent | b854eceee3a867d64b20de18d6b7ce91b33abed0 (diff) | |
| parent | 9127fe2978f9b29a96034b5a55ac33b873e22159 (diff) | |
Merged in DV528-merge-6.4.21 (pull request #607)
DRTVWR-528 merge up to 6.4.21
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 7360bd7659..67dd24341c 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -183,6 +183,8 @@ public: void setMakeVisibleControlVariable(LLControlVariable* control); void setMakeInvisibleControlVariable(LLControlVariable* control); + void setFunctionName(const std::string& function_name); + virtual void setTentative(BOOL b); virtual BOOL getTentative() const; virtual void setValue(const LLSD& value); @@ -310,6 +312,8 @@ protected: LLControlVariable* mMakeInvisibleControlVariable; boost::signals2::connection mMakeInvisibleControlConnection; + std::string mFunctionName; + static F32 sActiveControlTransparency; static F32 sInactiveControlTransparency; |