aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llcharacter.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llcharacter/llcharacter.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/llcharacter/llcharacter.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 83487bc..71c5c40 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -287,8 +287,8 @@ BOOL LLCharacter::setVisualParamWeight(LLVisualParam* which_param, F32 weight, B
287//----------------------------------------------------------------------------- 287//-----------------------------------------------------------------------------
288BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user) 288BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user)
289{ 289{
290 LLString tname(param_name); 290 std::string tname(param_name);
291 LLString::toLower(tname); 291 LLStringUtil::toLower(tname);
292 char *tableptr = sVisualParamNames.checkString(tname); 292 char *tableptr = sVisualParamNames.checkString(tname);
293 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 293 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
294 if (name_iter != mVisualParamNameMap.end()) 294 if (name_iter != mVisualParamNameMap.end())
@@ -338,8 +338,8 @@ F32 LLCharacter::getVisualParamWeight(LLVisualParam *which_param)
338//----------------------------------------------------------------------------- 338//-----------------------------------------------------------------------------
339F32 LLCharacter::getVisualParamWeight(const char* param_name) 339F32 LLCharacter::getVisualParamWeight(const char* param_name)
340{ 340{
341 LLString tname(param_name); 341 std::string tname(param_name);
342 LLString::toLower(tname); 342 LLStringUtil::toLower(tname);
343 char *tableptr = sVisualParamNames.checkString(tname); 343 char *tableptr = sVisualParamNames.checkString(tname);
344 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 344 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
345 if (name_iter != mVisualParamNameMap.end()) 345 if (name_iter != mVisualParamNameMap.end())
@@ -409,8 +409,8 @@ BOOL LLCharacter::visualParamWeightsAreDefault()
409//----------------------------------------------------------------------------- 409//-----------------------------------------------------------------------------
410LLVisualParam* LLCharacter::getVisualParam(const char *param_name) 410LLVisualParam* LLCharacter::getVisualParam(const char *param_name)
411{ 411{
412 LLString tname(param_name); 412 std::string tname(param_name);
413 LLString::toLower(tname); 413 LLStringUtil::toLower(tname);
414 char *tableptr = sVisualParamNames.checkString(tname); 414 char *tableptr = sVisualParamNames.checkString(tname);
415 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 415 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
416 if (name_iter != mVisualParamNameMap.end()) 416 if (name_iter != mVisualParamNameMap.end())
@@ -467,8 +467,8 @@ void LLCharacter::addVisualParam(LLVisualParam *param)
467 if (param->getInfo()) 467 if (param->getInfo())
468 { 468 {
469 // Add name map 469 // Add name map
470 LLString tname(param->getName()); 470 std::string tname(param->getName());
471 LLString::toLower(tname); 471 LLStringUtil::toLower(tname);
472 char *tableptr = sVisualParamNames.addString(tname); 472 char *tableptr = sVisualParamNames.addString(tname);
473 std::pair<VisualParamNameMap_t::iterator, bool> nameres; 473 std::pair<VisualParamNameMap_t::iterator, bool> nameres;
474 nameres = mVisualParamNameMap.insert(VisualParamNameMap_t::value_type(tableptr, param)); 474 nameres = mVisualParamNameMap.insert(VisualParamNameMap_t::value_type(tableptr, param));