diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-23 10:13:11 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-23 10:13:11 -0400 |
| commit | 056685d9d4ac82aad45e46ae5d5226690d416513 (patch) | |
| tree | 7f20ea566ee324303582b83c62530b6fa7d7bf98 /indra/newview/llappviewer.cpp | |
| parent | 75cfa9a0c3c15e3a472a4c4fd2462402a3a766a0 (diff) | |
| parent | 77911533dc68731f50f40b18cd44e287df28f476 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -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(); |