diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:12:29 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:12:29 -0800 |
| commit | 7eff61af30d68738445628edf1e52254e5f8fc24 (patch) | |
| tree | 4cf178cc930d58c2e0034ab522add1362f74234e /indra/llui/lltextbase.cpp | |
| parent | 9d2102519d88feec434b79e1d9bb7d86ac6e7794 (diff) | |
| parent | d181b84dfdce83d1999d086c3eda2cdc51849a11 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 97ba691341..8d36c9c616 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -286,8 +286,7 @@ bool LLTextBase::truncate() LLStyle::Params LLTextBase::getDefaultStyle() { - LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() ); - return LLStyle::Params().color(text_color).font(mDefaultFont).drop_shadow(mFontShadow); + return LLStyle::Params().color(mFgColor.get()).readonly_color(mReadOnlyFgColor.get()).font(mDefaultFont).drop_shadow(mFontShadow); } void LLTextBase::onValueChange(S32 start, S32 end) @@ -2232,7 +2231,7 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele const LLFontGL* font = mStyle->getFont(); - LLColor4 color = mStyle->getColor() % alpha; + LLColor4 color = (mEditor.getReadOnly() ? mStyle->getReadOnlyColor() : mStyle->getColor()) % alpha; font = mStyle->getFont(); |