livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more param location logging, added wearable type info to dumpArchetypeXML

master
Brad Payne (Vir Linden) 2012-10-17 13:43:19 -04:00
parent 4a0a88ed33
commit 7d6da2ebe8
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llappearance/llwearable.cpp
View File

@ -128,7 +128,10 @@ void LLWearable::createVisualParams(LLAvatarAppearance *avatarp)
{
if (param->getWearableType() == mType)
{
addVisualParam(param->cloneParam(this));
LLVisualParam *clone_param = param->cloneParam(this);
clone_param->setParamLocation(LOC_UNKNOWN);
clone_param->setParamLocation(LOC_WEARABLE);
addVisualParam(clone_param);
}
}

2
indra/llcharacter/llvisualparam.cpp
View File

@ -324,7 +324,7 @@ void LLVisualParam::resetDrivenParams()
void LLVisualParam::setParamLocation(EParamLocation loc)
{
if (mParamLocation == LOC_UNKNOWN)
if (mParamLocation == LOC_UNKNOWN || loc == LOC_UNKNOWN)
{
mParamLocation = loc;
}

11
indra/newview/llvoavatar.cpp
View File

@ -6306,8 +6306,15 @@ void dump_visual_param(apr_file_t* file, LLVisualParam* viewer_param, F32 value)
type_string = "param_morph";
if (dynamic_cast<LLPolySkeletalDistortion*>(viewer_param))
type_string = "param_skeleton";
apr_file_printf(file, "\t\t<param id=\"%d\" name=\"%s\" value=\"%.3f\"/ type=\"%s\">\n",
viewer_param->getID(), viewer_param->getName().c_str(), value, type_string.c_str());
S32 wtype = -1;
LLViewerVisualParam *vparam = dynamic_cast<LLViewerVisualParam*>(viewer_param);
if (vparam)
{
wtype = vparam->getWearableType();
}
apr_file_printf(file, "\t\t<param id=\"%d\" name=\"%s\" value=\"%.3f\" type=\"%s\" wearable=\"%s\"/>\n",
viewer_param->getID(), viewer_param->getName().c_str(), value, type_string.c_str(),
LLWearableType::getTypeName(LLWearableType::EType(wtype)).c_str());
}