Merge branch 'future' of git://github.com/siana/SingularityViewer.git

This commit is contained in:
Shyotl
2011-06-30 10:27:13 -05:00
65 changed files with 1714 additions and 1374 deletions

View File

@@ -3606,10 +3606,8 @@ void LLAppViewer::idle()
// *FIX: (???) SAMANTHA
if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected)
{
// <edit> we are not transmitting session stats
//llinfos << "Transmitting sessions stats" << llendl;
//send_stats();
// </edit>
llinfos << "Transmitting sessions stats" << llendl;
send_stats();
viewer_stats_timer.reset();
}