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/llflexibleobject.cpp | |
| parent | b3e9c46c94dad0c81a5adcb9152521b5368c66a7 (diff) | |
| parent | 9e031934461c72fb97eecd4f074e1fe6d43fc1c0 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
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 |