diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llvovolume.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 58f94120d0..37353cf7ec 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -452,7 +452,7 @@ void LLVOVolume::updateTextures() if (isHUDAttachment()) { - F32 area = (F32) gCamera->getScreenPixelArea(); + F32 area = (F32) LLViewerCamera::getInstance()->getScreenPixelArea(); vsize = area; imagep->setBoostLevel(LLViewerImage::BOOST_HUD); face->setPixelArea(area); // treat as full screen @@ -557,7 +557,7 @@ F32 LLVOVolume::getTextureVirtualSize(LLFace* face) LLVector3 center = face->getPositionAgent(); LLVector3 size = (face->mExtents[1] - face->mExtents[0]) * 0.5f; - F32 face_area = LLPipeline::calcPixelArea(center, size, *gCamera); + F32 face_area = LLPipeline::calcPixelArea(center, size, *LLViewerCamera::getInstance()); face->setPixelArea(face_area); @@ -651,7 +651,7 @@ LLDrawable *LLVOVolume::createDrawable(LLPipeline *pipeline) } updateRadius(); - mDrawable->updateDistance(*gCamera); + mDrawable->updateDistance(*LLViewerCamera::getInstance()); return mDrawable; } |