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/llspatialpartition.cpp | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 38c4f72fc9..98b4c4ef42 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1076,7 +1076,7 @@ LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible) if (drawablep->getPositionGroup().magVecSquared() > MAX_MAG) { -#ifndef LL_RELEASE_FOR_DOWNLOAD +#if 0 //ndef LL_RELEASE_FOR_DOWNLOAD llwarns << "LLSpatialPartition::put Object out of range!" << llendl; llinfos << drawablep->getPositionGroup() << llendl; @@ -1726,8 +1726,9 @@ void LLSpatialPartition::processImagery(LLCamera* camera) gPipeline.mCubeBuffer->initGL(); } + S32 res = gSavedSettings.getS32("RenderReflectionRes"); gPipeline.generateReflectionMap(gPipeline.mCubeBuffer, cube_cam, 128); - gPipeline.blurReflectionMap(gPipeline.mCubeBuffer, cube_map, 64); + gPipeline.blurReflectionMap(gPipeline.mCubeBuffer, cube_map, res); group->mReflectionMap = cube_map; group->setState(LLSpatialGroup::GEOM_DIRTY); gPipeline.markRebuild(group); @@ -2203,7 +2204,7 @@ void LLSpatialPartition::doOcclusion(LLCamera* camera) glFlush(); - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); } class LLOctreeGet : public LLSpatialGroup::OctreeTraveler |