diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-25 18:19:28 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-25 18:19:28 -0500 |
| commit | 96438194cd138dba58a24d2bef35cd72932ab62a (patch) | |
| tree | 918950b075c491d5fed3acd03a23dd600f59c177 /indra/newview/llvoavatar.cpp | |
| parent | 9233f08ddb8ecfffb56638533a4089f13ad7fb12 (diff) | |
| parent | b6f814af25a957e71dc8d9dd314ac15e3cbe6cd9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 95d4be17b5..266b9fecd5 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5910,6 +5910,7 @@ void LLVOAvatar::updateRezzedStatusTimers() for (S32 i = 1; i < 4; i++) { startPhase("load_" + LLVOAvatar::rezStatusToString(i)); + startPhase("first_load_" + LLVOAvatar::rezStatusToString(i)); } } if (rez_status < mLastRezzedStatus) @@ -5926,6 +5927,7 @@ void LLVOAvatar::updateRezzedStatusTimers() for (S32 i = llmax(mLastRezzedStatus+1,1); i <= rez_status; i++) { stopPhase("load_" + LLVOAvatar::rezStatusToString(i)); + stopPhase("first_load_" + LLVOAvatar::rezStatusToString(i), false); } if (rez_status == 3) { |