summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-21 18:08:33 -0400
committerOz Linden <oz@lindenlab.com>2011-09-21 18:08:33 -0400
commit4c25b7398b1c1fcdd155f4021a6f63b1bff88cdb (patch)
treee937a0146c54c47a14f9189f779f4bfe2541fa84 /indra
parentf8442cef72dd35a713dd111ad7f055d696f4d7ae (diff)
parent7d7d0e696a59b7af22abc5aed7cf4fd0bd7d4550 (diff)
merge changes for storm-1616
Diffstat (limited to 'indra')
-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);
}