diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
| commit | c77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (patch) | |
| tree | d30164242aa4af36f721033eb7a93fb2f2198de4 /indra/newview/llworld.cpp | |
| parent | f1b1dbaba54ce678e6ec5311d4b50ded3f91d58c (diff) | |
| parent | e0adaa188ba06b6d3f3282121d149193de87c6e6 (diff) | |
merge changes for storm-250
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 { |