diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-05-27 17:04:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-05-27 17:04:48 -0400 |
| commit | d213946c6c8a3adda488e95e669514f6317beeb7 (patch) | |
| tree | fe96de62fc61dcb1ec885c996c603a77d20566ec /indra/llcharacter/llanimationstates.cpp | |
| parent | aa9c621cb90de75e919f36ba0f6db9d8bd447601 (diff) | |
EXT-6953 WIP - pre-push cleanup after review. Accumulated EXT-6953 commits reviewed by Nyx.
Diffstat (limited to 'indra/llcharacter/llanimationstates.cpp')
| -rw-r--r-- | indra/llcharacter/llanimationstates.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp index 879f97deec..4c24218fc3 100644 --- a/indra/llcharacter/llanimationstates.cpp +++ b/indra/llcharacter/llanimationstates.cpp @@ -412,6 +412,15 @@ void LLAnimationLibrary::animStateSetString( const LLUUID& state, const std::str mAnimMap[state] = mAnimStringTable.addString(name); } +std::string LLAnimationLibrary::animationName( const LLUUID& id ) const +{ + const char *cptr = gAnimLibrary.animStateToString(id); + if (cptr) + return std::string(cptr); + else + return std::string("[") + id.asString() + std::string("]"); +} + // Animation states that the user can trigger as part of a gesture // See struct LLAnimStateEntry in header for label location information const LLAnimStateEntry gUserAnimStates[] = { @@ -489,14 +498,5 @@ const LLAnimStateEntry gUserAnimStates[] = { const S32 gUserAnimStatesCount = LL_ARRAY_SIZE(gUserAnimStates); -std::string animationName( const LLUUID& id ) -{ - const char *cptr = gAnimLibrary.animStateToString(id); - if (cptr) - return std::string(cptr); - else - return std::string("[") + id.asString() + std::string("]"); -} - // End |
