diff options
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 4905ff8..7a225c8 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -114,7 +114,7 @@ | |||
114 | #include "llworld.h" | 114 | #include "llworld.h" |
115 | #include "pipeline.h" | 115 | #include "pipeline.h" |
116 | #include "llglslshader.h" | 116 | #include "llglslshader.h" |
117 | #include "viewer.h" | 117 | #include "llappviewer.h" |
118 | #include "lscript_byteformat.h" | 118 | #include "lscript_byteformat.h" |
119 | 119 | ||
120 | //#include "vtune/vtuneapi.h" | 120 | //#include "vtune/vtuneapi.h" |
@@ -1622,7 +1622,6 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info) | |||
1622 | // LLVOAvatar::buildCharacter() | 1622 | // LLVOAvatar::buildCharacter() |
1623 | // Deferred initialization and rebuild of the avatar. | 1623 | // Deferred initialization and rebuild of the avatar. |
1624 | //----------------------------------------------------------------------------- | 1624 | //----------------------------------------------------------------------------- |
1625 | extern BOOL gPrintMessagesThisFrame; | ||
1626 | void LLVOAvatar::buildCharacter() | 1625 | void LLVOAvatar::buildCharacter() |
1627 | { | 1626 | { |
1628 | LLMemType mt(LLMemType::MTYPE_AVATAR); | 1627 | LLMemType mt(LLMemType::MTYPE_AVATAR); |
@@ -7439,7 +7438,7 @@ void LLVOAvatar::onCustomizeEnd() | |||
7439 | 7438 | ||
7440 | avatar->updateMeshTextures(); | 7439 | avatar->updateMeshTextures(); |
7441 | 7440 | ||
7442 | if( !gQuit ) | 7441 | if( !LLApp::isExiting()) |
7443 | { | 7442 | { |
7444 | avatar->requestLayerSetUploads(); | 7443 | avatar->requestLayerSetUploads(); |
7445 | } | 7444 | } |