Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2011-08-08 19:20:39 +02:00
parent 370890b704 3853d50eec
commit 5e69c9fa05
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermedia.cpp
View File

@@ -682,9 +682,16 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi
LLURI uri(url);
std::string scheme = uri.scheme();
if(scheme.empty() || "http" == scheme || "https" == scheme)
if(scheme.empty() || ("http" == scheme || "https" == scheme))
{
LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
if(mime_type.empty())
{
LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
}
else if(initializeMedia(mime_type) && (plugin = getMediaPlugin()))
{
plugin->loadURI( url );
}
}
else if("data" == scheme || "file" == scheme || "about" == scheme)
{

2
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -100,7 +100,7 @@ std::string AIFilePicker::get_folder(std::string const& default_path, std::strin
{
// This is the last resort when all else failed. Open the file chooser in directory 'home'.
#if LL_WINDOWS
char const* envname = "HOMEPATH";
char const* envname = "USERPROFILE";
#else
char const* envname = "HOME";
#endif