diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-22 18:08:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-22 18:08:49 -0400 |
| commit | 1057caffaf24790be26376b2794059e7635dde7b (patch) | |
| tree | 6f207f916bcf9430ffd0e863600dca642ec799c7 /indra/newview/llfloaterurlentry.cpp | |
| parent | 7632861fc40ffd05b6a1704f629a38250600c294 (diff) | |
| parent | e15b7bafbb7168a721ffd286c1d1f4e6299abb44 (diff) | |
merge changes for latest snowstorm project viewer
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
| -rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 3 |
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())); |