diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-05 18:02:19 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-05 18:02:19 -0600 |
commit | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (patch) | |
tree | 4c50acac1e04f72f46c32a671b4b8dc071c6163f /indra/newview/llviewerobjectlist.cpp | |
parent | a74b5dfa923f8eeccc9b786143f0f832de3ad450 (diff) | |
parent | a6dbd8e089b7d0f462a8ed753258a442b1861541 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index c6ac7af93c..dc3be24e3a 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -2045,6 +2045,10 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe // llwarns << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << " id:" << fullid << llendl; return NULL; } + if(regionp) + { + regionp->addToCreatedList(local_id); + } mUUIDObjectMap[fullid] = objectp; setUUIDAndLocal(fullid, |