summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:22:22 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:22:22 +0300
commit8c67f588da1031ef6e468a7ab5eeb19020b0298c (patch)
treee1777144cae762eb9543f4d63875cb2b2646d295 /indra/newview/llstartup.cpp
parentb5d72cf657d2530025fa7b946077153736a27e46 (diff)
parent41f4e854732a7c75a813b2e99285cc41bde13e5e (diff)
Merged in lindenlab/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 2ed2f8644e..62560a2fc8 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -972,9 +972,6 @@ bool idle_startup()
// Load Avatars icons cache
LLAvatarIconIDCache::getInstance()->load();
- // Load media plugin cookies
- LLViewerMedia::loadCookieFile();
-
LLRenderMuteList::getInstance()->loadFromFile();
//-------------------------------------------------