summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
commitf6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch)
treeec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/newview/llviewerwindow.cpp
parentc2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff)
parent04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff)
Pull merge with lindenlab/viewer-bear
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 bf11bce3da..54cf7cf28d 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -313,7 +313,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;