summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorprep <none@none>2012-03-02 11:29:30 -0500
committerprep <none@none>2012-03-02 11:29:30 -0500
commitf5cebb27a72cf31723eb621bdcd117f7634a4e58 (patch)
tree656bda206f1467c61d37acee3440020281440b06 /indra/newview/llvoavatarself.cpp
parentc2a7006413ea5e4a0bf7b8b75fe5afdb51e9a6e5 (diff)
parente1e13bcab96565ddc7627139673519a09a60962f (diff)
merge
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 73390d2ea4..15786b5dd0 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()));
}