diff options
| author | max nikolenko <maximnproductengine@lindenlab.com> | 2017-03-15 17:38:16 +0000 |
|---|---|---|
| committer | max nikolenko <maximnproductengine@lindenlab.com> | 2017-03-15 17:38:16 +0000 |
| commit | 680faa5b018fdbc411e22a0f1efd6804c25339fd (patch) | |
| tree | 84111a27cafed2ae8b7d6ee982ee371ee6e3f4c8 /indra/newview/llstartup.cpp | |
| parent | 26d81d3d6cc56f8f8df9f33ff27229671fb8a2db (diff) | |
| parent | d23b6e442e0a4d3a8badb51efd7611e23d138b26 (diff) | |
Merged in MAINT-7168
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 347409fcab..0a85344025 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -967,6 +967,8 @@ bool idle_startup() // Load media plugin cookies LLViewerMedia::loadCookieFile(); + LLRenderMuteList::getInstance()->loadFromFile(); + //------------------------------------------------- // Handle startup progress screen //------------------------------------------------- |