diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
| commit | 875606a04d656ef6e5600a3a7fb6e8b52feb1945 (patch) | |
| tree | 7189f1cd0a2b043446e6f145cb9c72b3a1f125aa /indra/newview/llworld.cpp | |
| parent | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (diff) | |
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index e45b929b6f..e2463adde3 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -83,22 +83,25 @@ const F32 LLWorld::mWidthInMeters = mWidth * mScale; // // allocate the stack -LLWorld::LLWorld() +LLWorld::LLWorld() : + mLandFarClip(DEFAULT_FAR_PLANE), + mLastPacketsIn(0), + mLastPacketsOut(0), + mLastPacketsLost(0), + mMinRegionX(0), + mMaxRegionX(0), + mMinRegionY(0), + mMaxRegionY(0), + mSpaceTimeUSec(0) { - mSpaceTimeUSec = 0; - mLastPacketsIn = 0; - mLastPacketsOut = 0; - mLastPacketsLost = 0; - mLandFarClip = DEFAULT_FAR_PLANE; - - if (gNoRender) + for (S32 i = 0; i < 8; i++) { - return; + mEdgeWaterObjects[i] = NULL; } - for (S32 i = 0; i < 8; i++) + if (gNoRender) { - mEdgeWaterObjects[i] = NULL; + return; } LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4); |