diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-21 11:00:22 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-21 11:00:22 -0400 |
| commit | 2afde26d93cc8773f5e84d187844f909347fc1bf (patch) | |
| tree | 5857549829b90f047ae094ebd9b6a9d2817d59aa /indra/llui/lliconctrl.h | |
| parent | 132a2587dff85006636d8092ae1b34081f12fe69 (diff) | |
| parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) | |
merge
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rwxr-xr-x | indra/llui/lliconctrl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 8b1092df46..7971cd44d3 100755 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -79,7 +79,9 @@ protected: //the output size of the icon image if set. S32 mMinWidth, - mMinHeight; + mMinHeight, + mMaxWidth, + mMaxHeight; // If set to true (default), use the draw context transparency. // If false, will use transparency returned by getCurrentTransparency(). See STORM-698. |