diff options
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 2e97f80..f281734 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -1823,6 +1823,7 @@ bool LLAppViewer::initConfiguration() | |||
1823 | LLFirstUse::addConfigVariable("FirstVoice"); | 1823 | LLFirstUse::addConfigVariable("FirstVoice"); |
1824 | LLFirstUse::addConfigVariable("FirstMedia"); | 1824 | LLFirstUse::addConfigVariable("FirstMedia"); |
1825 | LLFirstUse::addConfigVariable("FirstLoginScreen"); | 1825 | LLFirstUse::addConfigVariable("FirstLoginScreen"); |
1826 | LLFirstUse::addConfigVariable("FirstPrivacy"); | ||
1826 | 1827 | ||
1827 | // [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a | 1828 | // [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a |
1828 | //LLFirstUse::addConfigVariable(RLV_SETTING_FIRSTUSE_DETACH); | 1829 | //LLFirstUse::addConfigVariable(RLV_SETTING_FIRSTUSE_DETACH); |
@@ -3420,18 +3421,22 @@ void LLAppViewer::idle() | |||
3420 | // Initialize the viewer_stats_timer with an already elapsed time | 3421 | // Initialize the viewer_stats_timer with an already elapsed time |
3421 | // of SEND_STATS_PERIOD so that the initial stats report will | 3422 | // of SEND_STATS_PERIOD so that the initial stats report will |
3422 | // be sent immediately. | 3423 | // be sent immediately. |
3423 | static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD); | 3424 | if(!gDisconnected && gHippoGridManager->getConnectedGrid()->isSecondLife()) |
3424 | reset_statistics(); | ||
3425 | |||
3426 | // Update session stats every large chunk of time | ||
3427 | // *FIX: (???) SAMANTHA | ||
3428 | /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009) | ||
3429 | if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected) | ||
3430 | { | 3425 | { |
3431 | llinfos << "Transmitting sessions stats" << llendl; | 3426 | static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD); |
3432 | send_stats(); | 3427 | reset_statistics(); |
3433 | viewer_stats_timer.reset(); | 3428 | |
3434 | } */ | 3429 | // Update session stats every large chunk of time |
3430 | // *FIX: (???) SAMANTHA | ||
3431 | |||
3432 | /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009)*/ | ||
3433 | if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD ) | ||
3434 | { | ||
3435 | llinfos << "Transmitting sessions stats" << llendl; | ||
3436 | send_stats(); | ||
3437 | viewer_stats_timer.reset(); | ||
3438 | } | ||
3439 | } | ||
3435 | 3440 | ||
3436 | // Print the object debugging stats | 3441 | // Print the object debugging stats |
3437 | static LLFrameTimer object_debug_timer; | 3442 | static LLFrameTimer object_debug_timer; |