diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 23:11:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 23:11:21 -0500 |
| commit | a7eadcccd02210349a07d10a52669f4678d8fae2 (patch) | |
| tree | 805ab195698913f6d4ecf6677c3d55e26a9aeeea | |
| parent | 2ff888d2bc7424e70a836adb8ec4cf27df75ab7b (diff) | |
Unused variable/function
| -rw-r--r-- | indra/newview/llvovolume.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d66aa567a8..38e54342ea 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2659,18 +2659,20 @@ BOOL LLVOVolume::isSculpted() const BOOL LLVOVolume::isMesh() const { +#if LL_MESH_ENABLED if (isSculpted()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); U8 sculpt_type = sculpt_params->getSculptType(); -#if LL_MESH_ENABLED + if ((sculpt_type & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH) // mesh is a mesh { return TRUE; } -#endif } +#endif + return FALSE; } @@ -3427,6 +3429,7 @@ void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group) static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume"); static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt"); +#if LL_MESH_ENABLED static LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj) { LLVOAvatar* avatar = vobj->getAvatar(); @@ -3453,7 +3456,7 @@ static LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj) return NULL; } - +#endif void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) { |