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

Dump XML tweaks, suppress wearable updates when bakes should dominate

master
Brad Payne (Vir Linden) 2012-09-11 20:57:04 -04:00
parent fc84d68450
commit b4866775a2
9 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewermenu.cpp
View File

@ -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");

5
indra/newview/llvoavatar.cpp
View File

@ -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;
}

2
indra/newview/llwearable.cpp
View File

@ -619,7 +619,7 @@ void LLWearable::setTexturesToDefaults()
void LLWearable::writeToAvatar()
{
if (!isAgentAvatarValid()) return;
#if 0
#if 1
if (!gAgentAvatarp->isUsingLocalAppearance())
{
return;

2
indra/newview/skins/default/xui/en/menu_attachment_other.xml
View File

@ -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"

2
indra/newview/skins/default/xui/en/menu_attachment_self.xml
View File

@ -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" />

2
indra/newview/skins/default/xui/en/menu_avatar_other.xml
View File

@ -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"

10
indra/newview/skins/default/xui/en/menu_avatar_self.xml
View File

@ -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>

2
indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
View File

@ -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"

2
indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
View File

@ -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>