diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
| commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
| tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/newview/llvovolume.cpp | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6619531953..b5b9e06831 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1768,7 +1768,8 @@ F32 LLVOVolume::getBinRadius() BOOL shrink_wrap = mDrawable->isAnimating(); BOOL alpha_wrap = FALSE; - //if (!shrink_wrap) + + if (!isHUDAttachment()) { for (S32 i = 0; i < mDrawable->getNumFaces(); i++) { @@ -1779,6 +1780,10 @@ F32 LLVOVolume::getBinRadius() } } } + else + { + shrink_wrap = FALSE; + } if (alpha_wrap) { @@ -1959,12 +1964,15 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_info->mVSize = facep->getVirtualSize(); draw_vec.push_back(draw_info); LLVOVolume* volume = (LLVOVolume*) facep->getViewerObject(); - LLColor3 col = volume->getLightColor(); + BOOL is_light = volume->mDrawable->isLight(); + + U8 alpha = is_light ? 196 : 160; + LLColor3 col = is_light ? volume->getLightColor() : LLColor3(0,0,0); LLColor4 col2 = facep->getRenderColor(); draw_info->mGlowColor.setVec((U8) (col.mV[0]*col2.mV[0]*255), (U8) (col.mV[1]*col2.mV[1]*255), (U8) (col.mV[2]*col2.mV[2]*255), - 196); + alpha); draw_info->mTextureMatrix = tex_mat; validate_draw_info(*draw_info); } @@ -2269,7 +2277,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) registerFace(group, facep, LLRenderPass::PASS_BUMP); } - if (vobj->getIsLight()) + if (vobj->getIsLight() || + (LLPipeline::sRenderGlow && facep->isState(LLFace::FULLBRIGHT))) { registerFace(group, facep, LLRenderPass::PASS_GLOW); } |