summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-03-21 18:58:24 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-03-21 18:58:24 -0400
commit231b90cbacaf4e95e528c3335659f1959907cf59 (patch)
treece2babef9a8ac5b2f1175f34309c470a51720204 /indra/newview/llagent.cpp
parent4c8c4eb28a05056b59461374947b8fffb4e35a3d (diff)
SH-3039 WIP - trying to close phases where needed
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llagent.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8aba2e76a2..3f1f410db8 100644..100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3783,6 +3783,13 @@ void LLAgent::sendAgentSetAppearance()
return;
}
+ if (!gAgentWearables.changeInProgress())
+ {
+ // Change is fully resolved, can close some open phases.
+ gAgentAvatarp->stopPhase("process_initial_wearables_update");
+ gAgentAvatarp->stopPhase("wear_inventory_category");
+ }
+
gAgentAvatarp->sendAppearanceChangeMetrics();
LL_DEBUGS("Avatar") << gAgentAvatarp->avString() << "TAT: Sent AgentSetAppearance: " << gAgentAvatarp->getBakedStatusForPrintout() << LL_ENDL;
//dumpAvatarTEs( "sendAgentSetAppearance()" );