diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
| commit | 7ac8658c774428aa531cf8d004463d5c0991ae62 (patch) | |
| tree | 96577339efce5ccb30dc3968ebb3ee2bd9ea4155 /indra/newview/llappviewer.cpp | |
| parent | 85b677823f1515f242e403a6c160af4a9f3ee595 (diff) | |
| parent | fe91462d6277251dbcc6053bc8ecd54dd93a13f0 (diff) | |
(hairy) merge from viewer-release
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 21766a731d..d222d94ec6 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(); |