summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-03-21 17:40:49 -0400
commitfa4359e571fb67aca651efc3403274cdf0bb2616 (patch)
tree029261cf0981e0472f2bd34bbae20dbcfbc26925 /indra/newview/llworld.cpp
parent3f3429fa6854c6462abf3bbabf4af1dbbeb4c337 (diff)
parentb9a9b0017dd4714cbca4b0ddb69ed5e6b2f09528 (diff)
STORM-1051: merge daggy fix to tip
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 9db6d5e08c..d9ec41e73a 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];
@@ -624,10 +619,7 @@ void LLWorld::updateVisibilities()
if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))
{
regionp->calculateCameraDistance();
- if (!gNoRender)
- {
- regionp->getLand().updatePatchVisibilities(gAgent);
- }
+ regionp->getLand().updatePatchVisibilities(gAgent);
}
else
{