diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
| commit | 2c536cd91dcdb89319fc569f34ee49cfaccd8a5d (patch) | |
| tree | ba304e9cc5bec1caebc360618cfa39bd8c3ffdd9 /indra/newview/llstartup.cpp | |
| parent | 4a684fb9e27be77f7069215b597bb0e7807757b3 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
merge changes for 5.1.3-release
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 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(); //------------------------------------------------- |