diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-22 14:02:15 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-22 14:02:15 -0500 |
commit | 167a7dcd2fec57c8f93e3731679ea61bbd040b79 (patch) | |
tree | 970a8ea7bf976ca1ae74a37103452219d4027289 /indra/newview/llvoavatarself.cpp | |
parent | e5f81fdcc98ded831c48c4e31a4a215877e0a1e4 (diff) | |
parent | 52782548c83dc0ca0fc8352e1a3ad68784116a91 (diff) |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 5 |
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())); } |