diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llui/llcombobox.h | |
parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llui/llcombobox.h')
-rw-r--r-- | indra/llui/llcombobox.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 1ec31ec1c0..faf99937c9 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -167,8 +167,9 @@ protected: BOOL mDrawButton; LLLineEditor* mTextEntry; LLPointer<LLImageGL> mArrowImage; + S32 mArrowImageWidth; BOOL mAllowTextEntry; - S32 mMaxChars; + S32 mMaxChars; BOOL mTextEntryTentative; void (*mPrearrangeCallback)(LLUICtrl*,void*); void (*mTextEntryCallback)(LLLineEditor*, void*); |