diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-09 18:11:34 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-09 18:11:34 -0400 |
| commit | af74e5e443934659e8a8a193980e6683e14e7fa1 (patch) | |
| tree | b26b8edae4aadcebdd029d9f76f384dc5fc7be94 /indra/newview/llvoavatarself.cpp | |
| parent | e4cced82343391292e61db03bb019e19827834c7 (diff) | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
merge viewer-release to runway
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | 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 5ba5ec8ef5..66cc107a87 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -67,10 +67,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())); } |