small tweaks to param debugging, restricting LLWearable::writeToAvatar

3 files changed, 6 insertions, 4 deletions

diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 1092b525d0..ec282c50eb 100644..100755
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -187,7 +187,9 @@ BOOL LLDriverParam::setInfo(LLDriverParamInfo *info)
 {
 	llassert(wearable);
 	LLDriverParam *new_param = new LLDriverParam(mAvatarAppearance, wearable);
+	// FIXME this clobbers mWearablep, which means any code currently using mWearablep is wrong.
 	*new_param = *this;
+//	new_param->mDriven.clear(); // clear driven list to avoid overwriting avatar driven params from wearables. 
 	return new_param;
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index cbd1ac692f..33add7d56c 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1600,7 +1600,7 @@ class LLAdvancedEnableAppearanceToXML : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		return gSavedSettings.getBOOL("DebugAvatarCompositeBaked");
+		return gSavedSettings.getBOOL("DebugAvatarAppearanceMessage");
 	}
 };
 
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index 5b74f1a976..373cc63b41 100755
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -322,12 +322,11 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp)
 
 	if (!viewer_avatar->isValid()) return;
 
-#if 0 // FIXME restrict to server-bake regions.
+    // FIXME restrict this check to server bake regions?
 	if (!viewer_avatar->isUsingLocalAppearance())
 	{
 		return;
 	}
-#endif
 
 	ESex old_sex = avatarp->getSex();
 
@@ -523,7 +522,8 @@ void LLViewerWearable::setLocalTextureObject(S32 index, LLLocalTextureObject &lt
 
 void LLViewerWearable::setVisualParams()
 {
-	for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); iter++)
+	for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin();
+		 iter != mVisualParamIndexMap.end(); iter++)
 	{
 		S32 id = iter->first;
 		LLVisualParam *wearable_param = iter->second;