summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-13 10:21:33 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-13 10:21:33 -0500
commit7fba28471a39e9ffaf866ca6cf379c6b684c0d18 (patch)
treea59a40bdaeb13aefd66121d0f780d8006bef2a3c /indra/newview/llvoavatar.cpp
parent2665106aebc4fde975aa13f5c093637e4d9d30ad (diff)
parent9ef4c33772b3d358fd90125ea82a05ae70c01643 (diff)
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 346c55e589..20d598d35b 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5933,6 +5933,12 @@ void LLVOAvatar::updateRezzedStatusTimers()
{
stopPhase("load_" + LLVOAvatar::rezStatusToString(i));
}
+ if (rez_status == 3)
+ {
+ // "fully loaded", mark any pending appearance change complete.
+ selfStopPhase("update_appearance_from_cof");
+ selfStopPhase("wear_inventory_category");
+ }
}
mLastRezzedStatus = rez_status;