From e1e1212daae33723e7da325f295a5c3a6bb78979 Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Wed, 7 May 2008 17:17:42 +0000
Subject: QAR-520 maintenance-7 merge -- svn merge -r 84923:86093
 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 --
 dataserver-is-deprecated

---
 indra/newview/llworld.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llworld.cpp')

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index e45b929b6f..07f4cbe0f0 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -84,13 +84,12 @@ const F32 LLWorld::mWidthInMeters = mWidth * mScale;
 
 // allocate the stack
 LLWorld::LLWorld()
+:	mLandFarClip(DEFAULT_FAR_PLANE),
+	mLastPacketsIn(0),
+	mLastPacketsOut(0),
+	mLastPacketsLost(0),
+	mSpaceTimeUSec(0)
 {
-	mSpaceTimeUSec = 0;
-	mLastPacketsIn = 0;
-	mLastPacketsOut = 0;
-	mLastPacketsLost = 0;
-	mLandFarClip = DEFAULT_FAR_PLANE;
-
 	if (gNoRender)
 	{
 		return;
-- 
cgit v1.3