summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-04-26 13:15:30 -0400
committerprep <prep@lindenlab.com>2012-04-26 13:15:30 -0400
commit8443190b66bf81f7e33b10abb6e2ab1250c68ba4 (patch)
tree4643bcea751082beee58bfbe795ac7194fc31a77 /indra/newview/llviewerobject.cpp
parent447a6ced446e233027eef0423e2c68870a51c506 (diff)
parentee230730c55a82e588c0bd1c98ff75f60f7f6427 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp5
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;
}