diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 13:36:04 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 13:36:04 -0700 |
| commit | d0e32770d75980f7a2d4f22006fa98229abae407 (patch) | |
| tree | 2b36271a7364851ef7dec6c40013845bb091ba41 /indra/newview | |
| parent | b26f7f5a6bfadde1f556f4b3aec62176ed514b83 (diff) | |
| parent | ef0dd59a7f5759abad516b851b049d47d90e65bc (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateranimpreview.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 32 |
3 files changed, 16 insertions, 27 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index 61be8ce77d..1f334815d6 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -1033,7 +1033,6 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicT mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable); mDummyAvatar->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET); mDummyAvatar->hideSkirt(); - gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance()); // stop extraneous animations mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE ); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8eabe8ed90..8e8ece829b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3209,15 +3209,6 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const F32 LLVOVolume::getStreamingCost() { - std::string header_lod[] = - { - "lowest_lod", - "low_lod", - "medium_lod", - "high_lod" - }; - - if (isMesh()) { const LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID()); @@ -3227,7 +3218,6 @@ F32 LLVOVolume::getStreamingCost() return LLMeshRepository::getStreamingCost(header, radius); } - return 0.f; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 64922ee991..f11cfc738d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2207,8 +2207,8 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) if(drawablep && !drawablep->isDead()) { - if (drawablep->isSpatialBridge()) - { + if (drawablep->isSpatialBridge()) + { const LLDrawable* root = ((LLSpatialBridge*) drawablep)->mDrawable; llassert(root); // trying to catch a bad assumption if (root && // // this test may not be needed, see above @@ -2220,24 +2220,24 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) LLViewerObject *vobj = rootparent->getVObj(); llassert(vobj); // trying to catch a bad assumption if (vobj) // this test may not be needed, see above - { + { const LLVOAvatar* av = vobj->asAvatar(); - if (av && av->isImpostor()) - { - return; - } - } + if (av && av->isImpostor()) + { + return; + } + } } } - sCull->pushBridge((LLSpatialBridge*) drawablep); - } - else - { - sCull->pushDrawable(drawablep); - } + sCull->pushBridge((LLSpatialBridge*) drawablep); + } + else + { + sCull->pushDrawable(drawablep); + } - drawablep->setVisible(camera); -} + drawablep->setVisible(camera); + } } void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion) |