aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r--linden/indra/newview/llappviewer.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 36a53d0..d920e84 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1864,6 +1864,7 @@ bool LLAppViewer::initConfiguration()
1864 LLFirstUse::addConfigVariable("FirstVoice"); 1864 LLFirstUse::addConfigVariable("FirstVoice");
1865 LLFirstUse::addConfigVariable("FirstMedia"); 1865 LLFirstUse::addConfigVariable("FirstMedia");
1866 LLFirstUse::addConfigVariable("FirstLoginScreen"); 1866 LLFirstUse::addConfigVariable("FirstLoginScreen");
1867 LLFirstUse::addConfigVariable("FirstPrivacy");
1867 1868
1868// [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a 1869// [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
1869 //LLFirstUse::addConfigVariable(RLV_SETTING_FIRSTUSE_DETACH); 1870 //LLFirstUse::addConfigVariable(RLV_SETTING_FIRSTUSE_DETACH);
@@ -3472,18 +3473,22 @@ void LLAppViewer::idle()
3472 // Initialize the viewer_stats_timer with an already elapsed time 3473 // Initialize the viewer_stats_timer with an already elapsed time
3473 // of SEND_STATS_PERIOD so that the initial stats report will 3474 // of SEND_STATS_PERIOD so that the initial stats report will
3474 // be sent immediately. 3475 // be sent immediately.
3475 static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD); 3476 if(!gDisconnected && gHippoGridManager->getConnectedGrid()->isSecondLife())
3476 reset_statistics();
3477
3478 // Update session stats every large chunk of time
3479 // *FIX: (???) SAMANTHA
3480 /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009)
3481 if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected)
3482 { 3477 {
3483 llinfos << "Transmitting sessions stats" << llendl; 3478 static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD);
3484 send_stats(); 3479 reset_statistics();
3485 viewer_stats_timer.reset(); 3480
3486 } */ 3481 // Update session stats every large chunk of time
3482 // *FIX: (???) SAMANTHA
3483
3484 /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009)*/
3485 if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD )
3486 {
3487 llinfos << "Transmitting sessions stats" << llendl;
3488 send_stats();
3489 viewer_stats_timer.reset();
3490 }
3491 }
3487 3492
3488 // Print the object debugging stats 3493 // Print the object debugging stats
3489 static LLFrameTimer object_debug_timer; 3494 static LLFrameTimer object_debug_timer;