diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-07-31 21:43:42 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-07-31 21:43:42 -0600 |
| commit | 3059b59b619123caf5cc3137ab0b983c28a2962b (patch) | |
| tree | dafc3dc293fa5ef09055fabb02f5876eb8c72865 /indra/newview/llviewerregion.cpp | |
| parent | bd5808765f7a74226d312afbb863c471528b8d1a (diff) | |
| parent | 484f4230149e82345eccb38f9d4655b2a3f59984 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index e28ea6f988..c55ccce47a 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1303,6 +1303,16 @@ void LLViewerRegion::killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>& LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry) { + if(!entry || !entry->getEntry()) + { + if(entry) + { + mImpl->mVisibleEntries.erase(entry); + entry->setState(LLVOCacheEntry::INACTIVE); + } + return NULL; + } + LLViewerObject* obj = NULL; if(!entry->getEntry()->hasDrawable()) //not added to the rendering pipeline yet { |