diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
| commit | 050dad0ce35207a4ac1562175e853590ad9b7681 (patch) | |
| tree | be5dc291d2313112e5733d8c004edfe67da6fc54 /indra/newview/llvoavatar.cpp | |
| parent | 6fd04521d720a3a4904069d10e8ed970d870ba7f (diff) | |
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4905ff82b9..7a225c8a12 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -114,7 +114,7 @@ #include "llworld.h" #include "pipeline.h" #include "llglslshader.h" -#include "viewer.h" +#include "llappviewer.h" #include "lscript_byteformat.h" //#include "vtune/vtuneapi.h" @@ -1622,7 +1622,6 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info) // LLVOAvatar::buildCharacter() // Deferred initialization and rebuild of the avatar. //----------------------------------------------------------------------------- -extern BOOL gPrintMessagesThisFrame; void LLVOAvatar::buildCharacter() { LLMemType mt(LLMemType::MTYPE_AVATAR); @@ -7439,7 +7438,7 @@ void LLVOAvatar::onCustomizeEnd() avatar->updateMeshTextures(); - if( !gQuit ) + if( !LLApp::isExiting()) { avatar->requestLayerSetUploads(); } |