summaryrefslogtreecommitdiff
path: root/indra/newview/llviewergesture.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llviewergesture.cpp
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewergesture.cpp')
-rw-r--r--indra/newview/llviewergesture.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp
index 4434098a42..2d2557f46a 100644
--- a/indra/newview/llviewergesture.cpp
+++ b/indra/newview/llviewergesture.cpp
@@ -126,7 +126,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
}
else
{
- LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation.c_str());
+ LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation);
gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
}
}
@@ -161,8 +161,8 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou
{
S32 in_len = in_str.length();
- LLString in_str_lc = in_str;
- LLString::toLower(in_str_lc);
+ std::string in_str_lc = in_str;
+ LLStringUtil::toLower(in_str_lc);
for (S32 i = 0; i < count(); i++)
{
@@ -176,7 +176,7 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou
}
std::string trigger_trunc = utf8str_truncate(trigger, in_len);
- LLString::toLower(trigger_trunc);
+ LLStringUtil::toLower(trigger_trunc);
if (in_str_lc == trigger_trunc)
{
*out_str = trigger;