From 7d6da2ebe8db7aa73113659c709d03e16eca5094 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 17 Oct 2012 13:43:19 -0400
Subject: more param location logging, added wearable type info to
 dumpArchetypeXML

---
 indra/llappearance/llwearable.cpp   |  5 ++++-
 indra/llcharacter/llvisualparam.cpp |  2 +-
 indra/newview/llvoavatar.cpp        | 11 +++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index f4891c61bd..b33adb254d 100755
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -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);
 		}
 	}
 
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
index 1934ed55d3..826f76bae0 100755
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -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;
 	}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a2ace15f2d..fa6e572064 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -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());
 }
 
 
-- 
cgit v1.2.3