summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-12 14:26:48 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-02-12 14:26:48 -0500
commit02e9afd0e5d727ea0729fb2242b3a89247ae5b1a (patch)
treefa176d9dac48244fe1e739c0b8a1b07f04456b50
parente11fd0a7eb9e5aa39aa719f6d349506348a06d18 (diff)
SH-2852 WIP - track avatar loading via load_<foo> timers, added distinction between partially and fully loaded textures
-rwxr-xr-xindra/newview/llvoavatar.cpp2
-rwxr-xr-xindra/newview/llvoavatarself.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0cd97283e9..e2f455258d 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2908,7 +2908,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
bool all_baked_downloaded = allBakedTexturesCompletelyDownloaded();
bool all_local_downloaded = allLocalTexturesCompletelyDownloaded();
std::string debug_line = llformat("%s%s - mLocal: %d, mEdit: %d, mUSB: %d, CBV: %d",
- all_local_downloaded ? "L" : "l",
+ isSelf() ? (all_local_downloaded ? "L" : "l") : "-",
all_baked_downloaded ? "B" : "b",
mUseLocalAppearance, mIsEditingAppearance,
mUseServerBakes, central_bake_version);
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index fedab5cd06..8b29622fdb 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -99,7 +99,6 @@ void selfClearPhases()
if (isAgentAvatarValid())
{
gAgentAvatarp->clearPhases();
- //gAgentAvatarp->mLastRezzedStatus = -1;
}
}