From f2a9dbe0653c4cdda3fb809469b9d9148af0b7d7 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 3 Jul 2011 18:25:48 +0200 Subject: [PATCH] Revert "MIME type fix for media" This reverts commit af9259e6264ae9ce28930f2604c564b879bd4db7. --- indra/newview/llappviewer.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d561af202..fe0c476d1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -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);