diff options
| author | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
| commit | 2c92581ba7353067f72da567c6c4522a3a6c38a6 (patch) | |
| tree | ff11013ee4e91ecde7a3d1a4007a44fd1340f260 /indra/llui/lltextbase.h | |
| parent | f65a95157ae603116e61ee0203c0b22e6ac4f903 (diff) | |
| parent | 2c722547ea57c1510a82200242a3ccff2e505d17 (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 4b0eeeb7d6..bd41272f11 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -251,7 +251,7 @@ public: plain_text, wrap, use_ellipses, - allow_html, + parse_urls, parse_highlights, clip_partial; |