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/llsurfacepatch.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/llsurfacepatch.cpp')
| -rw-r--r-- | indra/newview/llsurfacepatch.cpp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index 2877fc66e3..7a475f21ba 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -52,29 +52,28 @@ extern U64 gFrameTime; extern LLPipeline gPipeline; LLSurfacePatch::LLSurfacePatch() : - mHasReceivedData(FALSE), - mSTexUpdate(FALSE), - mDirty(FALSE), - mDirtyZStats(TRUE), - mHeightsGenerated(FALSE), - mDataOffset(0), - mDataZ(NULL), - mVObjp(NULL), - mOriginRegion(0.f, 0.f, 0.f), - mCenterRegion(0.f, 0.f, 0.f), - mMinZ(0.f), - mMaxZ(0.f), - mMeanZ(0.f), - mRadius(0.f), - mMinComposition(0.f), - mMaxComposition(0.f), - mMeanComposition(0.f), - // This flag is used to communicate between adjacent surfaces and is - // set to non-zero values by higher classes. - mConnectedEdge(NO_EDGE), - mLastUpdateTime(0), - mSurfacep(NULL) -{ + mDataZ(NULL), + mVObjp(NULL), + mLastUpdateTime(0), + mSurfacep(NULL) +{ + // This flag is used to communicate between adjacent surfaces and is set + // to non-zero values by higher classes. + mConnectedEdge = NO_EDGE; + mCenterRegion = LLVector3(0.f, 0.f, 0.f); + mOriginRegion = LLVector3(0.f, 0.f, 0.f); + mHasReceivedData = FALSE; + mMinZ = 0.0f; + mMaxZ = 0.0f; + mMeanZ = 0.0f; + mMinComposition = 0.f; + mMeanComposition = 0.f; + mMaxComposition = 0.f; + mRadius = 0.f; + mDirty = FALSE; + mDirtyZStats = TRUE; + mHeightsGenerated = FALSE; + S32 i; for (i = 0; i < 8; i++) { |