diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-06 19:02:39 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-06 19:02:39 -0400 |
commit | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (patch) | |
tree | 9a2f099990176fad11c8904bfc7830f6e830a8f6 /indra/newview/llvoground.cpp | |
parent | b12ade128ba2a7f1a10b283abcfa12bfb15f06d3 (diff) | |
parent | 84884b06f206790ab5a4f52c7125665f9d32b7d8 (diff) |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'indra/newview/llvoground.cpp')
-rw-r--r-- | indra/newview/llvoground.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp index 6da54435e3..97b7418b40 100644 --- a/indra/newview/llvoground.cpp +++ b/indra/newview/llvoground.cpp @@ -49,18 +49,8 @@ LLVOGround::~LLVOGround() { } -BOOL LLVOGround::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +void LLVOGround::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { - if (mDead || !(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_GROUND))) - { - return TRUE; - } - - /*if (mDrawable) - { - gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE); - }*/ - return TRUE; } |