summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llhandmotion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcharacter/llhandmotion.cpp')
-rw-r--r--indra/llcharacter/llhandmotion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp
index 511ccc7a88..2ddbaeccf9 100644
--- a/indra/llcharacter/llhandmotion.cpp
+++ b/indra/llcharacter/llhandmotion.cpp
@@ -201,16 +201,16 @@ void LLHandMotion::onDeactivate()
//-----------------------------------------------------------------------------
// LLHandMotion::getHandPoseName()
//-----------------------------------------------------------------------------
-LLString LLHandMotion::getHandPoseName(eHandPose pose)
+std::string LLHandMotion::getHandPoseName(eHandPose pose)
{
if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0)
{
- return gHandPoseNames[pose];
+ return std::string(gHandPoseNames[pose]);
}
- return "";
+ return LLStringUtil::null;
}
-LLHandMotion::eHandPose LLHandMotion::getHandPose(LLString posename)
+LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
{
for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose)
{