diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
| commit | 2a61d908e790bfd554f3f0968b320a6e2f4d42c4 (patch) | |
| tree | 9e7cd6854a5e6b6c8d6cea31d9d4a8b8f649af7e /indra/newview/llworld.cpp | |
| parent | e32d1cf7564dd38664781ea7360fa8daa132961c (diff) | |
| parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 8f7197c607..c6f9b6f6e4 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -98,11 +98,6 @@ LLWorld::LLWorld() : mEdgeWaterObjects[i] = NULL; } - if (gNoRender) - { - return; - } - LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4); U8 *default_texture = raw->getData(); *(default_texture++) = MAX_WATER_COLOR.mV[0]; @@ -626,10 +621,7 @@ void LLWorld::updateVisibilities() if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius)) { regionp->calculateCameraDistance(); - if (!gNoRender) - { - regionp->getLand().updatePatchVisibilities(gAgent); - } + regionp->getLand().updatePatchVisibilities(gAgent); } else { |