diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-21 10:08:13 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-21 10:08:13 +0300 |
| commit | 52abfbbc4a3fbf55379fab861a1312eb5cecbc4d (patch) | |
| tree | 6fc1f5396a45e843e47e49ca5dced78b8cffcae4 /indra | |
| parent | f97e196d0698716fe215dfa1719519055de2cacc (diff) | |
| parent | 390bef2091b3458d93d009a98728e9115ead9302 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 296e3b7e86..58b651ec39 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -357,7 +357,7 @@ static void ui_audio_callback(const LLUUID& uuid) bool create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base) { - if(!match || !base) + if(!match || !base || base->getPlainText()) return false; LLUUID match_id = match->getID(); |