diff options
author | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 17:37:29 -0700 |
commit | 2a7d604e87df5a48bfb0abeb0d7b897a117005fb (patch) | |
tree | 783a46ee6f16e484ac35b933bace359b2eb2d1b8 /indra/newview/llviewertexteditor.cpp | |
parent | cc7440d0853d269a5b955ab021db729ed5b6a92c (diff) | |
parent | 043f2e0bfd40d29464175de838e3a36aad6e81df (diff) |
ACME-306 : Pull merge from viewer-chui
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
-rw-r--r-- | indra/newview/llviewertexteditor.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 122d8f4a96..8036a4e258 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -1052,8 +1052,6 @@ void LLViewerTextEditor::findEmbeddedItemSegments(S32 start, S32 end) { LLWString text = getWText(); - LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() ); - // Start with i just after the first embedded item for(S32 idx = start; idx < end; idx++ ) { |