summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-09 10:12:44 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-09 10:12:44 +0100
commite24bfa78666788bc1e5179ff5d4ac3bf7d0a5491 (patch)
tree8321dff00268a5f8783586a9e59a6dee7b50e2aa /indra/newview/llstartup.cpp
parent275581a3855f7c9c593ad314dfa386ceb952169c (diff)
parentae43801f44d6c1c23bb6aea17452c7ddcdec65a3 (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e51e6363dd..fff80e57dc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -781,9 +781,6 @@ 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