diff options
| author | simon <none@none> | 2013-04-12 09:26:59 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-12 09:26:59 -0700 |
| commit | cd8cd8c265abb0c568ee7b925551023c8081c298 (patch) | |
| tree | 6ff5a8eb20e17852e997777ea79f8314409b602d /indra/llui/llkeywords.cpp | |
| parent | e2836d99d8d1295c123a67bdc572ab9a36b6389f (diff) | |
Fix merge oddities
Diffstat (limited to 'indra/llui/llkeywords.cpp')
| -rw-r--r-- | indra/llui/llkeywords.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 5f9dbb33ad..26d27d1f34 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -367,7 +367,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW const llwchar* base = wtext.c_str(); const llwchar* cur = base; - (void)line; while( *cur ) { if( *cur == '\n' || cur == base ) |