diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 20:48:38 +0000 |
| commit | d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch) | |
| tree | 56b3723fed44031e888de9019b1ad127acdb1806 /indra/newview/llworld.cpp | |
| parent | e1e1212daae33723e7da325f295a5c3a6bb78979 (diff) | |
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 07f4cbe0f0..e45b929b6f 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -84,12 +84,13 @@ 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; |