summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-29 13:10:37 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-29 13:10:37 -0700
commit58a73b4fc1e39df13c3c11a6f286cdeeace26c4f (patch)
tree90e97c7ba30f4b037a72032088b9ed78290110fb /indra/newview
parent7f639cb715af7f63bd8780c04a84eff8fa07a87a (diff)
MAINT-1791 : Parcel media clear list crash. Reviewed by Kelly
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterurlentry.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 151cd2a1cd..e85d849c9a 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -219,7 +219,8 @@ void LLFloaterURLEntry::onBtnOK( void* userdata )
}
// Discover the MIME type only for "http" scheme.
- if(scheme == "http" || scheme == "https")
+ if(!media_url.empty() &&
+ (scheme == "http" || scheme == "https"))
{
LLHTTPClient::getHeaderOnly( media_url,
new LLMediaTypeResponder(self->getHandle()));