diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-25 15:27:13 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-25 15:27:13 -0700 |
| commit | ee230730c55a82e588c0bd1c98ff75f60f7f6427 (patch) | |
| tree | 6a89fb8eea71e99267c7136a72e96106c0fa12cb /indra/newview/llviewerobject.cpp | |
| parent | 857259f85228d0ff4858db9a5942b614b84b0f91 (diff) | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 37b23b571c..2a0e06a57d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -144,7 +144,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco } else { - gAgentAvatarp->updateRegion(regionp); + if (isAgentAvatarValid()) + { + gAgentAvatarp->updateRegion(regionp); + } } res = gAgentAvatarp; } |