summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterurlentry.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-09 15:18:20 -0500
committerOz Linden <oz@lindenlab.com>2013-01-09 15:18:20 -0500
commitcdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch)
treef59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llfloaterurlentry.cpp
parentbf55755262244c7c36df781d2e093b4109f6ecbf (diff)
parent42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff)
merge changes for DRTVWR-276
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
-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()));