diff options
| author | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
| commit | ad440a68bb6a481f17ea8b0cb8f3cecf37502d51 (patch) | |
| tree | b41c81b55f73b6ebd4ee0a14dd195c07d7ce2d40 /indra/newview/llappviewer.cpp | |
| parent | b25d969b61eb1e4f114ee0e632d1de9777780e9f (diff) | |
| parent | 57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 333c92e50d..02a8c3e674 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2135,7 +2135,7 @@ bool LLAppViewer::initConfiguration() if (clp.hasOption("nonotifications")) { - gSavedSettings.setBOOL("IgnoreAllNotifications", TRUE); + gSavedSettings.getControl("IgnoreAllNotifications")->setValue(true, false); } if (clp.hasOption("debugsession")) @@ -2182,8 +2182,8 @@ bool LLAppViewer::initConfiguration() if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString()) { // hack to force the skin to default. - //gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); - gDirUtilp->setSkinFolder("default"); + gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); + //gDirUtilp->setSkinFolder("default"); } mYieldTime = gSavedSettings.getS32("YieldTime"); |