diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llviewergesture.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llviewergesture.cpp')
-rw-r--r-- | linden/indra/newview/llviewergesture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp index 5c739b7..a080663 100644 --- a/linden/indra/newview/llviewergesture.cpp +++ b/linden/indra/newview/llviewergesture.cpp | |||
@@ -126,7 +126,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) | |||
126 | } | 126 | } |
127 | else | 127 | else |
128 | { | 128 | { |
129 | LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation.c_str()); | 129 | LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation); |
130 | gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START); | 130 | gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START); |
131 | } | 131 | } |
132 | } | 132 | } |
@@ -161,8 +161,8 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou | |||
161 | { | 161 | { |
162 | S32 in_len = in_str.length(); | 162 | S32 in_len = in_str.length(); |
163 | 163 | ||
164 | LLString in_str_lc = in_str; | 164 | std::string in_str_lc = in_str; |
165 | LLString::toLower(in_str_lc); | 165 | LLStringUtil::toLower(in_str_lc); |
166 | 166 | ||
167 | for (S32 i = 0; i < count(); i++) | 167 | for (S32 i = 0; i < count(); i++) |
168 | { | 168 | { |
@@ -176,7 +176,7 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou | |||
176 | } | 176 | } |
177 | 177 | ||
178 | std::string trigger_trunc = utf8str_truncate(trigger, in_len); | 178 | std::string trigger_trunc = utf8str_truncate(trigger, in_len); |
179 | LLString::toLower(trigger_trunc); | 179 | LLStringUtil::toLower(trigger_trunc); |
180 | if (in_str_lc == trigger_trunc) | 180 | if (in_str_lc == trigger_trunc) |
181 | { | 181 | { |
182 | *out_str = trigger; | 182 | *out_str = trigger; |