summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-26 19:27:10 -0500
committerDave Parks <davep@lindenlab.com>2011-09-26 19:27:10 -0500
commitbd02cdc75f1c752a127d1303527be3a96479af93 (patch)
treed8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/llstartup.cpp
parentd475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff)
parent8dbfa022778f2a7fcd5d2b527045724551279412 (diff)
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 749acea6c1..11a4c96f14 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1919,11 +1919,6 @@ bool idle_startup()
LLTrans::getString("LoginPrecaching"),
gAgent.mMOTD);
display_startup();
- if (!LLViewerShaderMgr::sInitialized)
- {
- LLViewerShaderMgr::sInitialized = TRUE;
- LLViewerShaderMgr::instance()->setShaders();
- }
}
return TRUE;