Put in some changes along sg1.4 dev history.

This commit is contained in:
Siana Gearz
2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions

View File

@@ -647,9 +647,11 @@ public:
*/
void send_stats()
{
// <edit> Don't want to send ViewerStats
if(1) return;
// </edit>
if(gSavedSettings.controlExists("SingularityDontSendViewerStats") &&
gSavedSettings.getBOOL("SingularityDontSendViewerStats"))
{
return;
}
// IW 9/23/02 I elected not to move this into LLViewerStats
// because it depends on too many viewer.cpp globals.
// Someday we may want to merge all our stats into a central place