diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-10-21 12:36:56 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-10-21 12:36:56 +0300 |
| commit | 154e9a7c54cebee2d8cfc88261d0c8898ff57c09 (patch) | |
| tree | 2d01f03f5851c843bfd08e1724e75c2672e4d10c /indra/newview/llstartup.cpp | |
| parent | 370cbd429d3763405795a95cb9355a302b56014a (diff) | |
| parent | 920b6de4b1b2234b356258dc7ea1fb108d648cea (diff) | |
Merge with viewer-release 3.7.19
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 74df18810c..9da7717b74 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1891,19 +1891,6 @@ bool idle_startup() display_startup(); - // based on the comments, we've successfully logged in so we can delete the 'forced' - // URL that the updater set in settings.ini (in a mostly paranoid fashion) - std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" ); - if ( nextLoginLocation.length() ) - { - // clear it - gSavedSettings.setString( "NextLoginLocation", "" ); - - // and make sure it's saved - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE ); - LLUIColorTable::instance().saveUserSettings(); - }; - display_startup(); // JC: Initializing audio requests many sounds for download. init_audio(); |