diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-24 20:12:41 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-24 20:12:41 +0000 |
| commit | 33250359f3e5d24ba22c4df95a496a692d9ae7b2 (patch) | |
| tree | 28668efa6581f53ad86d2f3c61ab09b6a3a6873d /indra/newview/llvovolume.cpp | |
| parent | aa2b978bf59dd74083bec86c61a29fefb4ebb14c (diff) | |
QAR-1262 Merging non-voice related Viewer 1.22 RC 9 changes back to trunk.
svn merge -r109446-109676 -r109832-109921 -r109956 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.22
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 9e051a6470..9d6fb6ebd5 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -507,7 +507,7 @@ void LLVOVolume::updateTextures() if (mSculptTexture.notNull()) { S32 lod = llmin(mLOD, 3); - F32 lodf = ((F32)(4-lod)/4.f); // 0 -> 1.0, 3 -> .25 + F32 lodf = ((F32)(lod + 1.0f)/4.f); F32 tex_size = lodf * MAX_SCULPT_REZ; mSculptTexture->addTextureStats(2.f * tex_size * tex_size); mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(), @@ -752,10 +752,10 @@ void LLVOVolume::sculpt() // corrupted volume... don't update the sculpty return; } - else if (current_discard > max_discard) + else if (current_discard > MAX_DISCARD_LEVEL) { llwarns << "WARNING!!: Current discard of sculpty at " << current_discard - << " is more than than allowed max of " << max_discard << llendl; + << " is more than than allowed max of " << MAX_DISCARD_LEVEL << llendl; // corrupted volume... don't update the sculpty return; @@ -2006,10 +2006,10 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e if (face_hit >= 0 && mDrawable->getNumFaces() > face_hit) { LLFace* face = mDrawable->getFace(face_hit); - v_end = p; - + if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n))) { + v_end = p; if (face_hitp != NULL) { *face_hitp = face_hit; |