diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-11-07 17:51:03 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-11-07 17:51:03 +0000 |
| commit | f89f19990cbb9f3f2e7473ac6c159098bdfabec7 (patch) | |
| tree | e7fa406e2db5e9adc2e24e00557d7b3d3f93203a /indra/newview/lldrawable.cpp | |
| parent | b2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (diff) | |
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index b207c44e95..1592cc0a8b 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -362,6 +362,7 @@ void LLDrawable::makeActive() if (pcode == LLViewerObject::LL_VO_WATER || pcode == LLViewerObject::LL_VO_SURFACE_PATCH || pcode == LLViewerObject::LL_VO_PART_GROUP || + pcode == LLViewerObject::LL_VO_HUD_PART_GROUP || pcode == LLViewerObject::LL_VO_CLOUDS || pcode == LLViewerObject::LL_VO_GROUND || pcode == LLViewerObject::LL_VO_SKY) @@ -1380,7 +1381,10 @@ BOOL LLDrawable::isAnimating() const { return TRUE; } - + if (mVObjp->getPCode() == LLViewerObject::LL_VO_HUD_PART_GROUP) + { + return TRUE; + } if (mVObjp->getPCode() == LLViewerObject::LL_VO_CLOUDS) { return TRUE; |