diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-21 18:08:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-21 18:08:33 -0400 |
| commit | 4c25b7398b1c1fcdd155f4021a6f63b1bff88cdb (patch) | |
| tree | e937a0146c54c47a14f9189f779f4bfe2541fa84 | |
| parent | f8442cef72dd35a713dd111ad7f055d696f4d7ae (diff) | |
| parent | 7d7d0e696a59b7af22abc5aed7cf4fd0bd7d4550 (diff) | |
merge changes for storm-1616
| -rw-r--r-- | .hgtags | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -188,8 +188,10 @@ b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start 0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release 1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-77_3.0.0-release 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1 -586907287be581817b2422b5137971b22d54ea48 3.0.4-start 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1 +586907287be581817b2422b5137971b22d54ea48 3.0.4-start 61aa7974df089e8621fe9a4c69bcdefdb3cc208a DRTVWR-89_3.0.3-beta2 61aa7974df089e8621fe9a4c69bcdefdb3cc208a 3.0.3-beta2 +0496d2f74043cf4e6058e76ac3db03d44cff42ce DRTVWR-84_3.0.3-release +0496d2f74043cf4e6058e76ac3db03d44cff42ce 3.0.3-release 92a3aa04775438226399b19deee12ac3b5a62838 3.0.5-start 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); } |