diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
| commit | a7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch) | |
| tree | 81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/newview/llvowater.cpp | |
| parent | df93749819c503a66bc0ad34aeb1c7bed3746df2 (diff) | |
| parent | b9e43dfd646990be236e44814ce3199de3391dc1 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llvowater.cpp')
| -rw-r--r-- | indra/newview/llvowater.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index 942eff6171..e8a1c3d1d6 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -100,17 +100,8 @@ void LLVOWater::updateTextures() } // Never gets called -BOOL LLVOWater::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +void LLVOWater::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { - /*if (mDead || !(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER))) - { - return TRUE; - } - if (mDrawable) - { - gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE); - }*/ - return TRUE; } LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline) |