diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
| commit | 57040ea70e21ea5cfaedfd8a3506362a03562552 (patch) | |
| tree | eb9dc090ab72bea2353de8a940ccdc7ab69d830e /indra/newview/llavatarrenderinfoaccountant.cpp | |
| parent | 8881b47d22a7cd17824e8162e0658af71bbe3dea (diff) | |
| parent | d5877bc365292358eb4c9b8d14d1c8a1237ca5bd (diff) | |
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
Diffstat (limited to 'indra/newview/llavatarrenderinfoaccountant.cpp')
| -rw-r--r-- | indra/newview/llavatarrenderinfoaccountant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp index 9e3225a264..77d734cbfe 100644 --- a/indra/newview/llavatarrenderinfoaccountant.cpp +++ b/indra/newview/llavatarrenderinfoaccountant.cpp @@ -336,7 +336,7 @@ void LLAvatarRenderInfoAccountant::idle() sRenderInfoReportTimer.resetWithExpiry(SECS_BETWEEN_REGION_SCANS); } - static LLCachedControl<U32> render_auto_mute_functions(gSavedSettings, "RenderAutoMuteFunctions"); + static LLCachedControl<U32> render_auto_mute_functions(gSavedSettings, "RenderAutoMuteFunctions", 0); static U32 prev_render_auto_mute_functions = (U32) -1; if (prev_render_auto_mute_functions != render_auto_mute_functions) { |