aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:07 -0500
committerJacek Antonelli2008-08-15 23:45:07 -0500
commit8465910c79b8e746e04fd581cca2d60399e569b9 (patch)
treef43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llvovolume.cpp
parentSecond Life viewer sources 1.18.2.1 (diff)
downloadmeta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/llvovolume.cpp')
-rw-r--r--linden/indra/newview/llvovolume.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index a0a83f5..4656eda 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -2086,7 +2086,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
2086 } 2086 }
2087 2087
2088 //add face to drawmap 2088 //add face to drawmap
2089 std::vector<LLDrawInfo*>& draw_vec = group->mDrawMap[type]; 2089 LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[type];
2090 2090
2091 S32 idx = draw_vec.size()-1; 2091 S32 idx = draw_vec.size()-1;
2092 2092
@@ -2111,7 +2111,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
2111 U32 end = start + facep->getGeomCount()-1; 2111 U32 end = start + facep->getGeomCount()-1;
2112 U32 offset = facep->getIndicesStart(); 2112 U32 offset = facep->getIndicesStart();
2113 U32 count = facep->getIndicesCount(); 2113 U32 count = facep->getIndicesCount();
2114 LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 2114 LLPointer<LLDrawInfo> draw_info = new LLDrawInfo(start,end,count,offset,tex,
2115 facep->mVertexBuffer, fullbright, bump); 2115 facep->mVertexBuffer, fullbright, bump);
2116 draw_info->mVSize = facep->getVirtualSize(); 2116 draw_info->mVSize = facep->getVirtualSize();
2117 draw_vec.push_back(draw_info); 2117 draw_vec.push_back(draw_info);
@@ -2151,7 +2151,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
2151 U32 end = start + facep->getGeomCount()-1; 2151 U32 end = start + facep->getGeomCount()-1;
2152 U32 offset = facep->getIndicesStart(); 2152 U32 offset = facep->getIndicesStart();
2153 U32 count = facep->getIndicesCount(); 2153 U32 count = facep->getIndicesCount();
2154 LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 2154 LLPointer<LLDrawInfo> draw_info = new LLDrawInfo(start,end,count,offset,tex,
2155 facep->mVertexBuffer, fullbright, bump); 2155 facep->mVertexBuffer, fullbright, bump);
2156 draw_info->mVSize = facep->getVirtualSize(); 2156 draw_info->mVSize = facep->getVirtualSize();
2157 draw_vec.push_back(draw_info); 2157 draw_vec.push_back(draw_info);