summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-25 16:50:45 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-25 16:50:45 +0200
commitbac40450646460466d4d7f266ef6185b6ee0e981 (patch)
treef95a582f20e347185d6c44ce426bf8b4aec659cb /indra/llui
parentf9e12e9f6b614db645c79c13795c1a1d67bae7fd (diff)
parent410e105f5293813dc63542414382e67273ab1d52 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lltextbase.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 17aecaf32f..47db990a37 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1009,6 +1009,16 @@ void LLTextBase::draw()
void LLTextBase::setColor( const LLColor4& c )
{
mFgColor = c;
+ //textsegments have own style property ,
+ //so we have to update it also to apply changes, EXT-4433
+ for(segment_set_t::iterator it = mSegments.begin(); it != mSegments.end(); it++)
+ {
+ LLTextSegment* segment = it->get();
+ if(segment)
+ {
+ segment->setColor(mFgColor);
+ }
+ }
}
//virtual