summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:29:22 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:29:22 +0300
commit4c0af0891e4e4c7e1894b900cdcc919e9d1d67cf (patch)
treef914ab13b227a428cc1e9de3f0a2aaff9457c4e5 /indra/newview/llstartup.cpp
parent6de246cd00a0d46763581dc8fa362c146e32d894 (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 7ea6a14e6b..8c5cad5af0 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -965,9 +965,6 @@ bool idle_startup()
// Load Avatars icons cache
LLAvatarIconIDCache::getInstance()->load();
- // Load media plugin cookies
- LLViewerMedia::loadCookieFile();
-
LLRenderMuteList::getInstance()->loadFromFile();
//-------------------------------------------------