diff options
author | Richard Linden <none@none> | 2012-08-30 16:51:06 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-30 16:51:06 -0700 |
commit | aaac4c7df5858a2dfc385b195446476947244dad (patch) | |
tree | dcdd2195110c15e0a4434507996d26d966080b59 /indra/newview/llspatialpartition.cpp | |
parent | b3e9c46c94dad0c81a5adcb9152521b5368c66a7 (diff) | |
parent | 9e031934461c72fb97eecd4f074e1fe6d43fc1c0 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 30f796a78e..5083478392 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -55,7 +55,7 @@ #include "llviewershadermgr.h" static LLFastTimer::DeclareTimer FTM_FRUSTUM_CULL("Frustum Culling"); -static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound"); +static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound Partition"); const F32 SG_OCCLUSION_FUDGE = 0.25f; #define SG_DISCARD_TOLERANCE 0.01f |