diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 16:30:39 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 16:30:39 +0200 |
| commit | bff45e735f55c474ecc6f485ef4b210ee0822b26 (patch) | |
| tree | 96c3af96911f3baa6ab76e8ddf4c45756933662c /indra/newview/llstartup.cpp | |
| parent | 8039b75ae8320a03a2a5339e5d0d1238de0335d2 (diff) | |
| parent | 78a16b9334c9484d328f8800e801196eacf3900f (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9be80c3add..696b0d9af1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -873,6 +873,9 @@ bool idle_startup() gViewerWindow->getWindow()->show(); display_startup(); + //DEV-10530. do cleanup. remove at some later date. jan-2009 + LLFloaterPreference::cleanupBadSetting(); + // DEV-16927. The following code removes errant keystrokes that happen while the window is being // first made visible. #ifdef _WIN32 @@ -1903,9 +1906,6 @@ bool idle_startup() //DEV-17797. get null folder. Any items found here moved to Lost and Found LLInventoryModel::findLostItems(); - //DEV-10530. do cleanup. remove at some later date. jan-2009 - LLFloaterPreference::cleanupBadSetting(); - LLStartUp::setStartupState( STATE_PRECACHE ); timeout.reset(); return FALSE; |