diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-25 13:01:55 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-25 13:01:55 -0400 |
| commit | ac6797c71ad2f75f9f34b3d6b8da4948825e6d57 (patch) | |
| tree | b50e441cc9c2f58064d74d19a631be0d521e457d /indra/newview/llagentwearables.cpp | |
| parent | 19ba8d8413c4541da2d76656776545334a09a38f (diff) | |
SH-3455 WIP - moved setAvatarObject() to run after the self av constructor. Disabled sendAgentWearablesUpdate.
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rwxr-xr-x | indra/newview/llagentwearables.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 77fd66e4ba..5a059008c4 100755 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -182,9 +182,11 @@ void LLAgentWearables::initClass() void LLAgentWearables::setAvatarObject(LLVOAvatarSelf *avatar) { llassert(avatar); - avatar->outputRezTiming("Sending wearables request"); - sendAgentWearablesRequest(); setAvatarAppearance(avatar); + gAgentWearables.notifyLoadingStarted(); + callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(), + boost::bind(&LLAppearanceMgr::updateAppearanceFromCOF, + LLAppearanceMgr::getInstance(), true, true, no_op)); } // wearables @@ -302,6 +304,8 @@ void LLAgentWearables::addWearabletoAgentInventoryDone(const LLWearableType::ETy // SUNSHINE CLEANUP dead? void LLAgentWearables::sendAgentWearablesUpdate() { + return; // try as NO_OP // SUNSHINE CLEANUP +#if 0 // First make sure that we have inventory items for each wearable for (S32 type=0; type < LLWearableType::WT_COUNT; ++type) { @@ -372,6 +376,7 @@ void LLAgentWearables::sendAgentWearablesUpdate() lldebugs << " " << LLWearableType::getTypeLabel((LLWearableType::EType)type) << ": " << (wearable ? wearable->getAssetID() : LLUUID::null) << llendl; } gAgent.sendReliableMessage(); +#endif } void LLAgentWearables::saveWearable(const LLWearableType::EType type, const U32 index, BOOL send_update, |