summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-11 16:19:35 -0500
committerOz Linden <oz@lindenlab.com>2013-11-11 16:19:35 -0500
commit3c2b90514d1390594149f35a88f2e5d27d173d58 (patch)
tree844fbaf5f5c285876601e098c2e109c35d542f07 /indra/newview/llviewerwindow.cpp
parentb8f1e2a7704bdac5ef270be21918317a17f77b2a (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
merge 3.6.10-release
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-xindra/newview/llviewerwindow.cpp2
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;