summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-22 08:54:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-22 08:54:12 +0100
commit87ae9a5190f1b8562c886ba0f36efbd6bd9925aa (patch)
treedf88bfa256e6adf6478963dcbf8dd730b5ace0b3 /indra/newview/llappviewer.cpp
parente1822b8845bb20514c41b37faaec71af5b1c1849 (diff)
parenta96f47db68dd52fa94bc3e9f652623583f85c60a (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
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();