summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-06 19:20:03 -0400
committerOz Linden <oz@lindenlab.com>2011-04-06 19:20:03 -0400
commit52615d251bc9261fe5765feefbcd31021bd75934 (patch)
tree2e259b393c6d2405d4a5e30ae9dd25e282c78a4d /indra/newview/llworld.cpp
parent0a802ae351153008b40d42106c866836d0ee4954 (diff)
parenta1a5a793a70f62c977e97b7433840fcb70f47c03 (diff)
pull pack late beta fixes from 2.6.3
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp10
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
{