summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-25 10:12:54 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-25 10:12:54 -0800
commit6ff6ed4d1148a66b188472c94b58bd573389942d (patch)
treea4a6e2a4711c3d9a3dd019e98507a568cac4ba60 /indra/llui/lltextbase.cpp
parentf11f8b34478f0d408689fe7959f233567001374d (diff)
parent254b7d72d17c279aa906ee235f08ff1fa9e2b9cf (diff)
PE merge.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-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