summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:24:36 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-04-12 21:24:36 +0300
commit46817fcbd3133cd27dee27309ff20f12ce4ce7b0 (patch)
tree1fc5fc341f4af30e6a11d9b4351560e1a3d5c384 /indra/newview/llstartup.cpp
parent31a2379607af21730e854773613e71c80a8caa0b (diff)
parent8c67f588da1031ef6e468a7ab5eeb19020b0298c (diff)
Merged in lindenlab/viewer-lynx
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();
//-------------------------------------------------