diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
| commit | 323a2f2235a52383bcfbae79bdce9e61ca808d2a (patch) | |
| tree | 313d298add46edae3dadc1f3426b8fa68f9452fe /indra/llui/llchatentry.h | |
| parent | 557adcabb925acbcc79f39f76f7cb74b6202a8da (diff) | |
| parent | 49731dd21dec5fb8b6e5781940bab5f5fa9600a2 (diff) | |
pulling in sunshine-stable to sunshine-internal.
Diffstat (limited to 'indra/llui/llchatentry.h')
| -rw-r--r-- | indra/llui/llchatentry.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h index 49181c8d78..49c8d21450 100644 --- a/indra/llui/llchatentry.h +++ b/indra/llui/llchatentry.h @@ -65,6 +65,7 @@ public: /*virtual*/ void onFocusReceived(); /*virtual*/ void onFocusLost(); + void enableSingleLineMode(bool single_line_mode); boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb); private: @@ -95,9 +96,11 @@ private: line_history_t mLineHistory; // line history storage bool mHasHistory; // flag for enabled/disabled line history bool mIsExpandable; + bool mSingleLineMode; - int mExpandLinesCount; - int mPrevLinesCount; + S32 mExpandLinesCount; + S32 mPrevLinesCount; + S32 mPrevExpandedLineCount; }; #endif /* LLCHATENTRY_H_ */ |