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

Revert "MIME type fix for media"

Browse Source 
This reverts commit af9259e626.
This commit is contained in:
Siana Gearz
2011-07-03 18:25:48 +02:00
parent 62f840adc3
commit f2a9dbe065
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llappviewer.cpp
View File

@@ -678,6 +678,9 @@ bool LLAppViewer::init()
LLViewerJointMesh::updateVectorize();
// load MIME type -> media impl mappings
LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") );
// Copy settings to globals. *TODO: Remove or move to appropriage class initializers
settings_to_globals();
// Setup settings listeners
@@ -2113,13 +2116,13 @@ bool LLAppViewer::initConfiguration()
}
}
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
{
gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
}
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
{
gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
}
mYieldTime = gSavedSettings.getS32("YieldTime");
mYieldTime = gSavedSettings.getS32("YieldTime");
// XUI:translate
gSecondLife = "Singularity Viewer";
@@ -2390,9 +2393,6 @@ bool LLAppViewer::initWindow()
LLTrans::parseStrings("strings.xml");
LLUITrans::parseStrings("ui_strings.xml");
// load MIME type -> media impl mappings
LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") );
// Show watch cursor
gViewerWindow->setCursor(UI_CURSOR_WAIT);