summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-02-13 19:13:22 -0600
committerDave Parks <davep@lindenlab.com>2012-02-13 19:13:22 -0600
commitca179444a1fb56bb42896c735b23906460c40d88 (patch)
tree38e44580db7ec792b283cd9e904aebf26f394a0f /indra/newview/llvoavatarself.cpp
parent041f1c1b03e2eee5d08c2b37883ebf5d5f9671df (diff)
SH-2973 Potential fix for crash in ~LLVOAvatarSelf
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r--indra/newview/llvoavatarself.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index f1df67494f..e525d6bad0 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -66,10 +66,11 @@
#include <boost/lexical_cast.hpp>
-LLVOAvatarSelf *gAgentAvatarp = NULL;
+LLPointer<LLVOAvatarSelf> gAgentAvatarp = NULL;
+
BOOL isAgentAvatarValid()
{
- return (gAgentAvatarp &&
+ return (gAgentAvatarp.notNull() &&
(gAgentAvatarp->getRegion() != NULL) &&
(!gAgentAvatarp->isDead()));
}