summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-18 16:16:10 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-18 16:16:10 -0400
commitdd4c0fa41701a53a11987b3adf837d49119cfbc2 (patch)
tree3cdf491c3a8cbedeec3b49c83e40f7773bfeda3b
parent955473266e511d5bb155be1645a7ec464b1ce0a7 (diff)
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
Fix for conditional deletion.
-rw-r--r--indra/newview/llvoavatarself.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index e8f42178a1..6eaec0e7a1 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1772,7 +1772,10 @@ void LLVOAvatarSelf::timingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *
{
mTextureLoadTimes[(U32)index][(U32)discard_level] = mSelfLoadTimer.getElapsedTimeF32();
}
- delete data;
+ if (final)
+ {
+ delete data;
+ }
}
void LLVOAvatarSelf::bakedTextureUpload(EBakedTextureIndex index, BOOL finished)
@@ -1957,7 +1960,7 @@ void LLVOAvatarSelf::setNewBakedTexture( ETextureIndex te, const LLUUID& uuid )
{
gAgent.sendAgentSetAppearance();
F32 final_time = mSelfLoadTimer.getElapsedTimeF32();
- llinfos << "AVATARREZTIME: Myself rez stats:" << llendl;
+ llinfos << "REZTIME: Myself rez stats:" << llendl;
llinfos << "\t Time from avatar creation to load wearables: " << (S32)mTimeWearablesLoaded << llendl;
llinfos << "\t Time from avatar creation to de-cloud: " << (S32)mTimeAvatarVisible << llendl;
llinfos << "\t Time from avatar creation to de-cloud for others: " << (S32)final_time << llendl;