aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llhandmotion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcharacter/llhandmotion.cpp')
-rw-r--r--linden/indra/llcharacter/llhandmotion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llcharacter/llhandmotion.cpp b/linden/indra/llcharacter/llhandmotion.cpp
index 3902518..f51e0d0 100644
--- a/linden/indra/llcharacter/llhandmotion.cpp
+++ b/linden/indra/llcharacter/llhandmotion.cpp
@@ -201,16 +201,16 @@ void LLHandMotion::onDeactivate()
201//----------------------------------------------------------------------------- 201//-----------------------------------------------------------------------------
202// LLHandMotion::getHandPoseName() 202// LLHandMotion::getHandPoseName()
203//----------------------------------------------------------------------------- 203//-----------------------------------------------------------------------------
204LLString LLHandMotion::getHandPoseName(eHandPose pose) 204std::string LLHandMotion::getHandPoseName(eHandPose pose)
205{ 205{
206 if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0) 206 if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0)
207 { 207 {
208 return gHandPoseNames[pose]; 208 return std::string(gHandPoseNames[pose]);
209 } 209 }
210 return ""; 210 return LLStringUtil::null;
211} 211}
212 212
213LLHandMotion::eHandPose LLHandMotion::getHandPose(LLString posename) 213LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
214{ 214{
215 for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose) 215 for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose)
216 { 216 {