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

Adding DebugAvatarExperimentalServerAppearanceUpdate setting to test sending full cof contents

meow-7.2.2
Don Kjer 2013-03-03 23:32:48 -08:00
parent a0a9a60e28
commit 8410887e2e
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -1937,6 +1937,17 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugAvatarExperimentalServerAppearanceUpdate</key>
<map>
<key>Comment</key>
<string>Experiment with sending full cof_contents instead of cof_version</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugAvatarRezTime</key>
<map>

48
indra/newview/llappearancemgr.cpp
View File

@ -3177,10 +3177,41 @@ LLSD LLAppearanceMgr::dumpCOF() const
const LLViewerInventoryItem* inv_item = item_array.get(i).get();
LLSD item;
item["item_id"] = inv_item->getUUID();
item["linked_item_id"] = inv_item->getLinkedUUID();
item["name"] = inv_item->getName();
item["description"] = inv_item->getActualDescription();
item["type"] = inv_item->getActualType();
item["asset_type"] = inv_item->getActualType();
item["inv_type"] = inv_item->getInventoryType();
item["linked_id"] = inv_item->getLinkedUUID();
if (LLAssetType::AT_LINK == inv_item->getActualType())
{
const LLViewerInventoryItem* linked_item = inv_item->getLinkedItem();
if (NULL == linked_item)
{
llwarns << "Broken link for item '" << inv_item->getName()
<< "' (" << inv_item->getUUID()
<< ") during requestServerAppearanceUpdate" << llendl;
continue;
}
if (linked_item->getAssetUUID().isNull())
{
llwarns << "Broken link (null asset) for item '" << inv_item->getName()
<< "' (" << inv_item->getUUID()
<< ") during requestServerAppearanceUpdate" << llendl;
continue;
}
item["linked_asset_id"] = linked_item->getAssetUUID();
item["linked_asset_type"] = linked_item->getType();
item["linked_flags"] = LLSD::Integer(linked_item->getFlags());
}
else if (LLAssetType::AT_LINK_FOLDER != inv_item->getActualType())
{
llwarns << "Non-link item '" << inv_item->getName()
<< "' (" << inv_item->getUUID()
<< ") type " << (S32) inv_item->getActualType()
<< " during requestServerAppearanceUpdate" << llendl;
continue;
}
result.append(item);
}
return result;
@ -3212,14 +3243,17 @@ void LLAppearanceMgr::requestServerAppearanceUpdate(LLCurl::ResponderPtr respond
LLSD body;
S32 cof_version = getCOFVersion();
body["cof_version"] = cof_version;
if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
if (gSavedSettings.getBOOL("DebugAvatarExperimentalServerAppearanceUpdate"))
{
body["cof_version"] = cof_version+999;
body["cof_contents"] = dumpCOF();
}
if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
else
{
body["debug_cof"] = dumpCOF();
body["cof_version"] = cof_version;
if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
{
body["cof_version"] = cof_version+999;
}
}
LL_DEBUGS("Avatar") << "request url " << url << " my_cof_version " << cof_version << llendl;