diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
| commit | 5d92dc44026f7dd237aa871593080fd151064e62 (patch) | |
| tree | 4f0c70e428824a0a01e38ff77850fb009b6c13f0 /indra/newview/lldrawable.cpp | |
| parent | 7614ceff24129643ecb96f57f0491507e4ff8dbd (diff) | |
| parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) | |
merge changes for 2.7.4 release
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index bdc12ec0e3..ad3710843c 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -94,7 +94,9 @@ void LLDrawable::init() mRenderType = 0; mCurrentScale = LLVector3(1,1,1); mDistanceWRTCamera = 0.0f; - + mPositionGroup.clear(); + mExtents[0].clear(); + mExtents[1].clear(); mQuietCount = 0; mState = 0; @@ -587,7 +589,10 @@ void LLDrawable::setRadius(F32 radius) void LLDrawable::moveUpdatePipeline(BOOL moved) { - makeActive(); + if (moved) + { + makeActive(); + } // Update the face centers. for (S32 i = 0; i < getNumFaces(); i++) @@ -695,7 +700,8 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) { if (LLViewerCamera::sCurCameraID != LLViewerCamera::CAMERA_WORLD) { - llerrs << "WTF?" << llendl; + llwarns << "Attempted to update distance for non-world camera." << llendl; + return; } //switch LOD with the spatial group to avoid artifacts |