diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/llui | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into 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, 8 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 47683d0ab4..04a6a181eb 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -212,7 +212,8 @@ public: mMaxContentWidth(0), mIndex(-1), mParentCtrl(NULL), - mHeader(NULL) + mHeader(NULL), + mFontAlignment(LLFontGL::LEFT) { } LLScrollListColumn(const LLSD &sd) @@ -260,6 +261,7 @@ 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 5617eb4873..f0f3ac3bdc 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -4003,7 +4003,11 @@ BOOL LLTextEditor::exportBuffer(LLString &buffer ) ////////////////////////////////////////////////////////////////////////// // LLTextSegment -LLTextSegment::LLTextSegment(S32 start) : mStart(start) +LLTextSegment::LLTextSegment(S32 start) : + mStart(start), + mEnd(0), + mToken(NULL), + mIsDefault(FALSE) { } LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) : |