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