summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-22 14:56:03 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-22 14:56:03 -0400
commit0a9d558cd02e8955415bbbaca20d57cd6eddab60 (patch)
treedbbabbe705663dbbf6af85526d83dcb729fa91a3 /indra/newview/llappviewer.cpp
parent75b2f617893f5712817f28282e517d3f70861613 (diff)
parent627bd3c5b998b6a743b7b412235bc5a287dadfc4 (diff)
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2e1108d42c..12795a1ec6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2326,7 +2326,7 @@ bool LLAppViewer::initConfiguration()
if (gSavedSettings.getBOOL("FirstRunThisInstall"))
{
- gSavedSettings.setString("SessionSettingsFile", "settings_minimal.xml");
+ gSavedSettings.setString("SessionSettingsFile", "settings.xml");
gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
}