diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
| commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
| tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/newview/lldrawable.cpp | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
| parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 4894d63e13..3cfcd88f04 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -254,11 +254,17 @@ S32 LLDrawable::findReferences(LLDrawable *drawablep) return count; } +static LLFastTimer::DeclareTimer FTM_ALLOCATE_FACE("Allocate Face", true); + LLFace* LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep) { - LLMemType mt(LLMemType::MTYPE_DRAWABLE); - LLFace *face = new LLFace(this, mVObjp); + LLFace *face; + { + LLFastTimer t(FTM_ALLOCATE_FACE); + face = new LLFace(this, mVObjp); + } + if (!face) llerrs << "Allocating new Face: " << mFaces.size() << llendl; if (face) @@ -280,10 +286,12 @@ LLFace* LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep) LLFace* LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep) { - LLMemType mt(LLMemType::MTYPE_DRAWABLE); - LLFace *face; - face = new LLFace(this, mVObjp); + + { + LLFastTimer t(FTM_ALLOCATE_FACE); + face = new LLFace(this, mVObjp); + } face->setTEOffset(mFaces.size()); face->setTexture(texturep); @@ -539,6 +547,10 @@ F32 LLDrawable::updateXform(BOOL undamped) } } } + else if (!damped && isVisible()) + { + dist_squared = dist_vec_squared(old_pos, target_pos); + } LLVector3 vec = mCurrentScale-target_scale; @@ -764,8 +776,6 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) void LLDrawable::updateTexture() { - LLMemType mt(LLMemType::MTYPE_DRAWABLE); - if (isDead()) { llwarns << "Dead drawable updating texture!" << llendl; |