diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
commit | 344c46a20c8055daada15d70bf2dbd2cd5555be8 (patch) | |
tree | d7ff514786aa3b1347ad768a64b68bfd08e99f90 /indra/newview/llagent.cpp | |
parent | 127f6d14050bd1d10b3a4b4b8a4c315da43e9f92 (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) |
merge, conflicts in llvertexbuffer.{h,cpp}
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x | indra/newview/llagent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 54ad3cd187..ab9b5ff436 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3314,6 +3314,7 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * } llinfos << "Received cached texture response for " << num_results << " textures." << llendl; + gAgentAvatarp->outputRezTiming("Fetched agent wearables textures from cache. Will now load them"); gAgentAvatarp->updateMeshTextures(); |