diff options
author | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
commit | 911472ed08490cbc08ba5009be82b247c51102a7 (patch) | |
tree | f9d5efb2e0037e5b602f2be23120910c40b94919 /indra/newview/llvoavatarself.cpp | |
parent | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (diff) | |
parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) |
Merge with viewer-release
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())); } |