aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvovolume.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index a6d3c0b..e352f14 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1952,7 +1952,6 @@ LLVolumePartition::LLVolumePartition()
1952 mPartitionType = LLViewerRegion::PARTITION_VOLUME; 1952 mPartitionType = LLViewerRegion::PARTITION_VOLUME;
1953 mSlopRatio = 0.25f; 1953 mSlopRatio = 0.25f;
1954 mBufferUsage = GL_DYNAMIC_DRAW_ARB; 1954 mBufferUsage = GL_DYNAMIC_DRAW_ARB;
1955 mImageEnabled = TRUE;
1956} 1955}
1957 1956
1958LLVolumeBridge::LLVolumeBridge(LLDrawable* drawablep) 1957LLVolumeBridge::LLVolumeBridge(LLDrawable* drawablep)
@@ -2045,7 +2044,6 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
2045 draw_info->mGroup = group; 2044 draw_info->mGroup = group;
2046 draw_info->mVSize = facep->getVirtualSize(); 2045 draw_info->mVSize = facep->getVirtualSize();
2047 draw_vec.push_back(draw_info); 2046 draw_vec.push_back(draw_info);
2048 draw_info->mReflectionMap = group->mReflectionMap;
2049 draw_info->mTextureMatrix = tex_mat; 2047 draw_info->mTextureMatrix = tex_mat;
2050 draw_info->mModelMatrix = model_mat; 2048 draw_info->mModelMatrix = model_mat;
2051 draw_info->mGlowColor.setVec(0,0,0,glow); 2049 draw_info->mGlowColor.setVec(0,0,0,glow);
@@ -2163,20 +2161,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
2163 2161
2164 LLFastTimer ftm2(LLFastTimer::FTM_REBUILD_VOLUME_VB); 2162 LLFastTimer ftm2(LLFastTimer::FTM_REBUILD_VOLUME_VB);
2165 2163
2166 //find reflection map
2167 if (group->mSpatialPartition->mImageEnabled && LLPipeline::sDynamicReflections)
2168 {
2169 if (group->mReflectionMap.isNull())
2170 {
2171 LLSpatialGroup* parent = group->getParent();
2172 while (parent && group->mReflectionMap.isNull())
2173 {
2174 group->mReflectionMap = parent->mReflectionMap;
2175 parent = parent->getParent();
2176 }
2177 }
2178 }
2179
2180 group->clearDrawMap(); 2164 group->clearDrawMap();
2181 2165
2182 mFaceList.clear(); 2166 mFaceList.clear();