diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
| commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
| tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/newview/lldrawable.cpp | |
| parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
| parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) | |
merge latest viewer-development
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 8f7b992093..debac9dcbf 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; @@ -586,7 +588,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++) @@ -694,7 +699,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 |