summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-07-15 14:17:51 -0500
committerDave Parks <davep@lindenlab.com>2010-07-15 14:17:51 -0500
commit93ea3d2850067c23ff07f0ffb362b73247840e9a (patch)
tree05b1bd136b33f1f9b2d70ce2d199f5c61d587991 /indra/newview/llvovolume.cpp
parent13202e744c35f0c6154cd0b582b1834896cacb79 (diff)
Merge cleanup.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4faef57074..36391a3602 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -96,13 +96,8 @@ LLPointer<LLObjectMediaNavigateClient> LLVOVolume::sObjectMediaNavigateClient =
static LLFastTimer::DeclareTimer FTM_GEN_TRIANGLES("Generate Triangles");
static LLFastTimer::DeclareTimer FTM_GEN_VOLUME("Generate Volumes");
-static LLFastTimer::DeclareTimer FTM_BUILD_MESH("Mesh");
-static LLFastTimer::DeclareTimer FTM_MESH_VFS("VFS");
-static LLFastTimer::DeclareTimer FTM_MESH_STREAM("Stream");
-static LLFastTimer::DeclareTimer FTM_MESH_FACES("Faces");
static LLFastTimer::DeclareTimer FTM_VOLUME_TEXTURES("Volume Textures");
-
// Implementation class of LLMediaDataClientObject. See llmediadataclient.h
class LLMediaDataClientObjectImpl : public LLMediaDataClientObject
{