diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-14 00:46:54 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-14 00:46:54 +0100 |
| commit | b9016effdf0c6f1e1748043eb061f8c4af911bfa (patch) | |
| tree | c2ceeecfb5b358fe0c240eaf20939f311cc573ad /indra/newview/llstartup.cpp | |
| parent | d850d6b2e5de0d03701eacdb34cc3eee601038cd (diff) | |
| parent | 033b6269593deb370378663354ee2a78eba54387 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 48ebbeb8d3..91fd76b40d 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(); //------------------------------------------------- |