diff options
author | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
commit | a07a8cbf6eca73272f2c774df7122a1f0c5e1aa9 (patch) | |
tree | f716bdae5a265aabf8f9da1413df6a19fe3ada52 /indra/llui/lliconctrl.h | |
parent | c938e165062cbe53065dcdaa434fc1c3d9f38774 (diff) | |
parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) |
merge changes for 4.0.4-release
Diffstat (limited to 'indra/llui/lliconctrl.h')
-rwxr-xr-x | indra/llui/lliconctrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 7971cd44d3..dd83e78fd3 100755 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -59,6 +59,8 @@ protected: LLIconCtrl(const Params&); friend class LLUICtrlFactory; + void setValue(const LLSD& value, S32 priority); + public: virtual ~LLIconCtrl(); |