diff options
| author | Stinson Linden <stinson@lindenlab.com> | 2014-05-29 21:08:21 +0100 |
|---|---|---|
| committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-29 21:08:21 +0100 |
| commit | 90fc7a13d1ebf766f727f4709853d2a9bd4f2d4e (patch) | |
| tree | 6909c4291a6be5d0e939f2424d6fce028e66237c | |
| parent | 72dba8742c3120fcb76b42aa6ede796bdad8554d (diff) | |
MAINT-4106: Correcting crash on exit behavior during normal shutdown. With the more comprehensive texture cleanup going on, this code was causing an crash on exit when gAgentAvatarp was null. Adding a check for null before proceeding.
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 319da1abb5..83e08ff1e8 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2033,7 +2033,10 @@ BOOL LLVOAvatarSelf::getIsCloud() const /*static*/ void LLVOAvatarSelf::debugOnTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata) { - gAgentAvatarp->debugTimingLocalTexLoaded(success, src_vi, src, aux_src, discard_level, final, userdata); + if (gAgentAvatarp.notNull()) + { + gAgentAvatarp->debugTimingLocalTexLoaded(success, src_vi, src, aux_src, discard_level, final, userdata); + } } void LLVOAvatarSelf::debugTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata) |