diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:41:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:41:56 -0400 |
| commit | bde49506e5b1a854f832f6f47781eac35853b1a0 (patch) | |
| tree | 4c022342c51e778ff6c6e8c6c697f345f079e938 /indra/newview/lldrawable.cpp | |
| parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
| parent | 524bd28eb51af47f4b489ee96f492c2b102ec253 (diff) | |
merge out beta updates
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index bdc12ec0e3..8f7b992093 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -385,7 +385,6 @@ void LLDrawable::makeActive() 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) { @@ -1513,10 +1512,6 @@ BOOL LLDrawable::isAnimating() const { return TRUE; } - if (mVObjp->getPCode() == LLViewerObject::LL_VO_CLOUDS) - { - return TRUE; - } if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero()) { |