diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9c748c7f86563c4794fe33b757bf924eb99e0555..e3e05ef80daafe86404807834e202ae75f748be7 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1596,6 +1596,14 @@ class LLAdvancedEnableGrabBakedTexture : public view_listener_t
///////////////////////
+class LLAdvancedEnableAppearanceToXML : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ return gSavedSettings.getBOOL("DebugAvatarCompositeBaked");
+ }
+};
+
class LLAdvancedAppearanceToXML : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@@ -8459,6 +8467,7 @@ void initialize_menus()
// Advanced > Character > Character Tests
view_listener_t::addMenu(new LLAdvancedAppearanceToXML(), "Advanced.AppearanceToXML");
+ view_listener_t::addMenu(new LLAdvancedEnableAppearanceToXML(), "Advanced.EnableAppearanceToXML");
view_listener_t::addMenu(new LLAdvancedToggleCharacterGeometry(), "Advanced.ToggleCharacterGeometry");
view_listener_t::addMenu(new LLAdvancedTestMale(), "Advanced.TestMale");
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 61816c1771c1aeca21b6b83129d83a215e98b562..96e59dd9ebc6b7d67ad2c95dff5c1fb1e7e9d9df 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7361,7 +7361,9 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// llinfos << "processAvatarAppearance end " << mID << llendl;
return;
}
+ clearVisualParamWeights();
}
+ dumpArchetypeXML("process_post_clear");
ESex old_sex = getSex();
@@ -7481,6 +7483,8 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
}
}
+ dumpArchetypeXML("process_post_set_weights");
+
const S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
if (num_blocks != expected_tweakable_count)
{
@@ -7545,6 +7549,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
updateMeshTextures();
+ dumpArchetypeXML("process_end");
// llinfos << "processAvatarAppearance end " << mID << llendl;
}
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index 3f07d6877c74100c7900033697f5acf97933d92c..b924a4471d06db989f74884f81eda36bc6b440c8 100755
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -619,7 +619,7 @@ void LLWearable::setTexturesToDefaults()
void LLWearable::writeToAvatar()
{
if (!isAgentAvatarValid()) return;
-#if 0
+#if 1
if (!gAgentAvatarp->isUsingLocalAppearance())
{
return;
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 6f922730977c2f07a64aa2c3dd5cdd8f6dfbf7cf..46ba4bd29d2786bf2c0ac1f7835dffb4765eac06 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -85,7 +85,7 @@
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_call
label="Zoom In"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 84e26268bdcb0d9c5e9dfab3a7c28c188085c7aa..28e032ce5f0e4f90c4eaf1c016efbb3d9003bfce 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -129,7 +129,7 @@ name="Edit Outfit">
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_separator
layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 1c39984625c305c35e6d43ad2da003b246188d25..e7c2b80da27f45f8b69c8297352885aab5d5a87c 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -85,7 +85,7 @@
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_call
label="Zoom In"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 0e79b0fee3674dc46d01573363a2ce6d48d6b692..c1ff026a74e51fb856db513c20fe177cc6882d12 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -267,14 +267,6 @@
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
- </menu_item_call>
- <menu_item_call
- label="Dump XML"
- name="Dump XML">
- <menu_item_call.on_click
- function="Advanced.AppearanceToXML" />
- <menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 4fdfb2281bbac60bbc36d04709bc4d1092f6685f..354ddc31099ca0255d163d39777e7e6d6a9a2320 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -118,7 +118,7 @@
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_call
label="Find On Map"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
index f935f0f312a832e3ebe552f29dc1d417935b419d..84815caca97bdfd07047751a8ba77c8f582e6394 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -255,6 +255,6 @@
<menu_item_call.on_click
function="Advanced.AppearanceToXML" />
<menu_item_call.on_visible
- function="IsGodCustomerService"/>
+ function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
</toggleable_menu>