diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
| commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
| tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/llui | |
| parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) | |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 4 | ||||
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 04a6a181eb..47683d0ab4 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -212,8 +212,7 @@ public: mMaxContentWidth(0), mIndex(-1), mParentCtrl(NULL), - mHeader(NULL), - mFontAlignment(LLFontGL::LEFT) + mHeader(NULL) { } LLScrollListColumn(const LLSD &sd) @@ -261,7 +260,6 @@ public: mIndex = -1; mParentCtrl = NULL; mHeader = NULL; - mFontAlignment = LLFontGL::LEFT; } // Public data is fine so long as this remains a simple struct-like data class. diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index f0f3ac3bdc..5617eb4873 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -4003,11 +4003,7 @@ BOOL LLTextEditor::exportBuffer(LLString &buffer ) ////////////////////////////////////////////////////////////////////////// // LLTextSegment -LLTextSegment::LLTextSegment(S32 start) : - mStart(start), - mEnd(0), - mToken(NULL), - mIsDefault(FALSE) +LLTextSegment::LLTextSegment(S32 start) : mStart(start) { } LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) : |