diff options
| author | Richard Linden <none@none> | 2012-08-30 18:39:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 18:39:59 -0700 |
| commit | c74d9f83a2a30ba364b983bc9e8abfd4099f6d68 (patch) | |
| tree | 091bcef45d0f1f69437870a8c35626fdf4bf189f /indra/newview/llflexibleobject.cpp | |
| parent | afc2807302f2a94b5cbb0fe86f304984ac7e50b8 (diff) | |
| parent | 9e031934461c72fb97eecd4f074e1fe6d43fc1c0 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 22c265cb8a..a37e27363f 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -48,7 +48,7 @@ std::vector<LLVolumeImplFlexible*> LLVolumeImplFlexible::sInstanceList; std::vector<S32> LLVolumeImplFlexible::sUpdateDelay; static LLFastTimer::DeclareTimer FTM_FLEXIBLE_REBUILD("Rebuild"); -static LLFastTimer::DeclareTimer FTM_DO_FLEXIBLE_UPDATE("Update"); +static LLFastTimer::DeclareTimer FTM_DO_FLEXIBLE_UPDATE("Flexible Update"); // LLFlexibleObjectData::pack/unpack now in llprimitive.cpp |