diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
| commit | 7ce37f9910016f7225621df9e70dd2fd7c41725d (patch) | |
| tree | db09b96def05e74d4b93de43d442618a70a52ef1 /indra/llui/lliconctrl.h | |
| parent | cbdf791fb1634c3c42c1e24da4b99dfdc3251f26 (diff) | |
| parent | 5099d01b74cfdd4ba192844b9fb7c5d19c454a54 (diff) | |
Merged lindenlab/viewer-lion into default
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. |