diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/llui/llkeywords.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/llkeywords.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp index 93da44c..a50dbff 100644 --- a/linden/indra/llui/llkeywords.cpp +++ b/linden/indra/llui/llkeywords.cpp | |||
| @@ -288,7 +288,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
| 288 | 288 | ||
| 289 | const llwchar* base = wtext.c_str(); | 289 | const llwchar* base = wtext.c_str(); |
| 290 | const llwchar* cur = base; | 290 | const llwchar* cur = base; |
| 291 | const llwchar* line = NULL; | ||
| 292 | 291 | ||
| 293 | while( *cur ) | 292 | while( *cur ) |
| 294 | { | 293 | { |
| @@ -304,7 +303,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
| 304 | } | 303 | } |
| 305 | 304 | ||
| 306 | // Start of a new line | 305 | // Start of a new line |
| 307 | line = cur; | ||
| 308 | 306 | ||
| 309 | // Skip white space | 307 | // Skip white space |
| 310 | while( *cur && isspace(*cur) && (*cur != '\n') ) | 308 | while( *cur && isspace(*cur) && (*cur != '\n') ) |