diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
| commit | 10705b43600d31b31d903ed1d4e3aba0bd4e2963 (patch) | |
| tree | df43426032ec82dc34f9019a063a4cdfa00be1da /indra/newview/llviewerwindow.cpp | |
| parent | 66b6bffca92261d418f9888be4c3542554ddb4af (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge 3.6.11 for RC-ability
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ff7642a773..cb7536edce 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -315,7 +315,7 @@ public: void update() { - static LLCachedControl<bool> log_texture_traffic(gSavedSettings,"LogTextureNetworkTraffic") ; + static LLCachedControl<bool> log_texture_traffic(gSavedSettings,"LogTextureNetworkTraffic", false) ; std::string wind_vel_text; std::string wind_vector_text; |