diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-04-13 14:50:07 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-04-13 14:50:07 -0700 |
| commit | 033b6269593deb370378663354ee2a78eba54387 (patch) | |
| tree | 200c8575c45a2384a8fa2803cd9a724c85057eae /indra/newview/llstartup.cpp | |
| parent | 7b56db31f91545102744885b4f70c93278e837bd (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (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(); //------------------------------------------------- |