diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/llui/llconsole.cpp | |
parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) |
merge up to 3.5.2 development
Diffstat (limited to 'indra/llui/llconsole.cpp')
-rw-r--r-- | indra/llui/llconsole.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 161496b1f5..c216d593a2 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -243,7 +243,6 @@ void LLConsole::draw() void LLConsole::Paragraph::makeParagraphColorSegments (const LLColor4 &color) { LLSD paragraph_color_segments; - LLColor4 lcolor=color; paragraph_color_segments[0]["text"] =wstring_to_utf8str(mParagraphText); LLSD color_sd = color.getValue(); |